[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/RoleService - Role.py:1.3 RoleService.py:1.3 configure.zcml:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/RoleService
In directory cvs.zope.org:/tmp/cvs-serv15462/lib/python/Zope/App/OFS/Services/RoleService

Modified Files:
	Role.py RoleService.py configure.zcml 
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/OFS/Services/RoleService/Role.py 1.2 => 1.3 ===
 from Zope.App.Security.IRole import IRole
 from Zope.ComponentArchitecture.IFactory import IFactory
-from Zope.App.Security.RegisteredObject import RegisteredObject
+from Zope.App.Security.Registries.RegisteredObject import RegisteredObject
 from Persistence import Persistent
 
 class Role(RegisteredObject, Persistent):


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/RoleService.py 1.2 => 1.3 ===
 from Zope.App.Security.IRoleService import IRoleService
 from Zope.App.OFS.Container.IContainer import IContainer
-from Zope.App.Security.RoleRegistry import roleRegistry
+from Zope.App.Security.Registries.RoleRegistry import roleRegistry
 from Zope.ContextWrapper import ContextMethod
 from Zope.ComponentArchitecture import getNextService
 


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/configure.zcml 1.2 => 1.3 ===
    xmlns='http://namespaces.zope.org/zope'
-   xmlns:security='http://namespaces.zope.org/security'
    xmlns:zmi='http://namespaces.zope.org/zmi'
    xmlns:browser='http://namespaces.zope.org/browser'
 
    xmlns:service='http://namespaces.zope.org/service'
 >
   <content class=".RoleService.">
-    <security:require
+    <require
         permission="Zope.Security"
         interface="Zope.App.Security.IRoleService." />
-    <security:require
+    <require
         permission="Zope.ManageServices"
         interface="Zope.App.OFS.Container.IContainer." />
   </content>
   
   <content class=".Role.">
-    <security:require
+    <require
         permission="Zope.Security"
         interface="Zope.App.Security.IRole." />
   </content>