[Zope3-checkins] CVS: Zope3/src/zope/app/securitypolicy - configure.zcml:1.8 principalpermission.py:1.3 principalrole.py:1.3 rolepermission.py:1.5

[Stephan Richter]

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

Modified Files:
	configure.zcml principalpermission.py principalrole.py 
	rolepermission.py 
Log Message:


Created annotation package in zope.app.



Moved annotation interfaces to zope.app.annotation.interfaces.



Moved attributeannotations to zope.app.annotation.attribute.


=== Zope3/src/zope/app/securitypolicy/configure.zcml 1.7 => 1.8 ===
--- Zope3/src/zope/app/securitypolicy/configure.zcml:1.7	Thu Mar 11 07:38:18 2004
+++ Zope3/src/zope/app/securitypolicy/configure.zcml	Sat Mar 13 18:01:07 2004
@@ -27,15 +27,15 @@
 
   <adapter factory=".rolepermission.AnnotationRolePermissionManager"
            provides=".interfaces.IRolePermissionManager"
-           for="zope.app.interfaces.annotation.IAnnotatable" />
+           for="zope.app.annotation.interfaces.IAnnotatable" />
 
   <adapter factory=".principalrole.AnnotationPrincipalRoleManager"
            provides=".interfaces.IPrincipalRoleManager"
-           for="zope.app.interfaces.annotation.IAnnotatable" />
+           for="zope.app.annotation.interfaces.IAnnotatable" />
 
   <adapter factory=".principalpermission.AnnotationPrincipalPermissionManager"
            provides=".interfaces.IPrincipalPermissionManager"
-           for="zope.app.interfaces.annotation.IAnnotatable" />
+           for="zope.app.annotation.interfaces.IAnnotatable" />
 
 
   <!-- protect Roles and Permissions -->
@@ -51,7 +51,7 @@
         interface="zope.app.utility.interfaces.ILocalUtility" 
         />
     <implements
-        interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
+        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
         />
     <require 
         permission="zope.Security"


=== Zope3/src/zope/app/securitypolicy/principalpermission.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/securitypolicy/principalpermission.py:1.2	Sat Mar  6 11:50:29 2004
+++ Zope3/src/zope/app/securitypolicy/principalpermission.py	Sat Mar 13 18:01:07 2004
@@ -17,7 +17,7 @@
 """
 
 from zope.interface import implements
-from zope.app.interfaces.annotation import IAnnotations
+from zope.app.annotation.interfaces import IAnnotations
 from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
 
 from zope.app.security.settings import Allow, Deny, Unset


=== Zope3/src/zope/app/securitypolicy/principalrole.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/securitypolicy/principalrole.py:1.2	Sat Mar  6 11:50:29 2004
+++ Zope3/src/zope/app/securitypolicy/principalrole.py	Sat Mar 13 18:01:07 2004
@@ -18,7 +18,7 @@
 from zope.interface import implements
 from zope.security.proxy import trustedRemoveSecurityProxy
 
-from zope.app.interfaces.annotation import IAnnotations
+from zope.app.annotation.interfaces import IAnnotations
 from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.app.securitypolicy.interfaces import IPrincipalRoleMap
 


=== Zope3/src/zope/app/securitypolicy/rolepermission.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/securitypolicy/rolepermission.py:1.4	Mon Mar  8 07:06:03 2004
+++ Zope3/src/zope/app/securitypolicy/rolepermission.py	Sat Mar 13 18:01:07 2004
@@ -17,7 +17,7 @@
 from zope.interface import implements
 
 from zope.app import zapi
-from zope.app.interfaces.annotation import IAnnotations
+from zope.app.annotation.interfaces import IAnnotations
 
 from zope.app.security.settings import Allow, Deny, Unset
 from zope.app.security.permission import checkPermission