[Checkins] SVN: grok/trunk/s remove the Role component too from grok as it is in grokcore.security now

[Jan Wijbrand Kolman]

Log message for revision 125450:
  remove the Role component too from grok as it is in grokcore.security now

Changed:
  U   grok/trunk/setup.py
  U   grok/trunk/src/grok/__init__.py
  U   grok/trunk/src/grok/components.py
  U   grok/trunk/src/grok/configure.zcml
  U   grok/trunk/src/grok/meta.zcml

-=-
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2012-05-01 07:35:51 UTC (rev 125449)
+++ grok/trunk/setup.py	2012-05-01 08:09:04 UTC (rev 125450)
@@ -51,8 +51,7 @@
         'grokcore.layout',
         'grokcore.message',
         'grokcore.rest',
-        'grokcore.security >= 1.1',
-        'grokcore.security[role]',
+        'grokcore.security[role] >= 1.1',
         'grokcore.site > 1.4',
         'grokcore.traverser',
         'grokcore.view >= 2.6.1',

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2012-05-01 07:35:51 UTC (rev 125449)
+++ grok/trunk/src/grok/__init__.py	2012-05-01 08:09:04 UTC (rev 125450)
@@ -35,7 +35,7 @@
 from grokcore.catalog import index
 from grokcore.content import Model, Container, OrderedContainer
 
-from grokcore.security import Permission
+from grokcore.security import Permission, Role
 from grokcore.security import Public
 from grokcore.security import require
 from grokcore.security import permissions
@@ -105,7 +105,6 @@
 from grok.components import ExceptionView, NotFoundView, UnauthorizedView
 from grok.components import XMLRPC, REST, JSON
 
-from grok.components import Role
 from grokcore.catalog import Indexes
 from grokcore.traverser import Traverser
 

Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py	2012-05-01 07:35:51 UTC (rev 125449)
+++ grok/trunk/src/grok/components.py	2012-05-01 08:09:04 UTC (rev 125450)
@@ -34,7 +34,6 @@
 from zope.publisher.interfaces import NotFound
 from zope.publisher.publish import mapply
 from zope.security.interfaces import IUnauthorized
-from zope.securitypolicy.role import Role as securitypolicy_Role
 
 import grok
 import martian.util
@@ -286,18 +285,3 @@
 
 class DisplayFormPage(ViewSupportMixin, grokcore.layout.DisplayFormPage):
     pass
-
-
-class Role(securitypolicy_Role):
-    """Base class for roles in Grok applications.
-
-    A role is a description of a class of users that gives them a
-    machine-readable name, a human-readable title, and a set of
-    permissions which users belong to that role should possess::
-
-        class Editor(grok.Role):
-            grok.name('news.Editor')
-            grok.title('Editor')
-            grok.permissions('news.EditArticle', 'news.PublishArticle')
-
-    """

Modified: grok/trunk/src/grok/configure.zcml
===================================================================
--- grok/trunk/src/grok/configure.zcml	2012-05-01 07:35:51 UTC (rev 125449)
+++ grok/trunk/src/grok/configure.zcml	2012-05-01 08:09:04 UTC (rev 125450)
@@ -38,7 +38,6 @@
   <include package="zope.app.publication" />
   <include package="zope.app.wsgi" />
 
-  <include package="grokcore.security" file="meta.zcml" />
   <include package="grokcore.annotation" />
   <include package="grokcore.chameleon" />
   <include package="grokcore.formlib" />

Modified: grok/trunk/src/grok/meta.zcml
===================================================================
--- grok/trunk/src/grok/meta.zcml	2012-05-01 07:35:51 UTC (rev 125449)
+++ grok/trunk/src/grok/meta.zcml	2012-05-01 08:09:04 UTC (rev 125450)
@@ -1,11 +1,8 @@
 <configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:meta="http://namespaces.zope.org/meta"
-    xmlns:grok="http://namespaces.zope.org/grok">
-
+  xmlns="http://namespaces.zope.org/zope"
+  xmlns:meta="http://namespaces.zope.org/meta"
+  xmlns:grok="http://namespaces.zope.org/grok">
   <include package="z3c.autoinclude" file="meta.zcml" />
-
-  <!-- Load the grokkers -->
   <include package="grokcore.component" file="meta.zcml" />
   <include package="grokcore.formlib" file="meta.zcml" />
   <include package="grokcore.security" file="meta.zcml" />
@@ -14,5 +11,4 @@
   <include package="grokcore.annotation" file="meta.zcml" />
   <include package="grokcore.site" file="meta.zcml" />
   <include package="grokcore.catalog" file="meta.zcml" />
-
 </configure>