[Checkins] SVN: grok/branches/philikon-grokcore.component/ Some essential directives (grok.context, grok.name, etc.) also have to move to

[Philipp von Weitershausen]

Log message for revision 79637:
  Some essential directives (grok.context, grok.name, etc.) also have to move to
  grokcore.component.
  

Changed:
  U   grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/__init__.py
  A   grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/directives.py
  U   grok/branches/philikon-grokcore.component/src/grok/__init__.py
  U   grok/branches/philikon-grokcore.component/src/grok/directive.py

-=-
Modified: grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/__init__.py
===================================================================
--- grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/__init__.py	2007-09-14 13:39:17 UTC (rev 79636)
+++ grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/__init__.py	2007-09-14 15:32:16 UTC (rev 79637)
@@ -15,4 +15,4 @@
 """
 from grokcore.component.components import Adapter, MultiAdapter, GlobalUtility
 from grokcore.component.decorators import subscribe, adapter, implementer
-
+from grokcore.component.directives import context, name, provides

Added: grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/directives.py
===================================================================
--- grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/directives.py	                        (rev 0)
+++ grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/directives.py	2007-09-14 15:32:16 UTC (rev 79637)
@@ -0,0 +1,26 @@
+##############################################################################
+#
+# Copyright (c) 2007 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Essential directives that are needed for the most basic component
+registrations
+"""
+from martian.directive import SingleTextDirective
+from martian.directive import InterfaceDirective
+from martian.directive import InterfaceOrClassDirective
+from martian.directive import ClassDirectiveContext
+from martian.directive import ClassOrModuleDirectiveContext
+
+name = SingleTextDirective('grok.name', ClassDirectiveContext())
+context = InterfaceOrClassDirective('grok.context',
+                                    ClassOrModuleDirectiveContext())
+provides = InterfaceDirective('grok.provides', ClassDirectiveContext())


Property changes on: grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/directives.py
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: grok/branches/philikon-grokcore.component/src/grok/__init__.py
===================================================================
--- grok/branches/philikon-grokcore.component/src/grok/__init__.py	2007-09-14 13:39:17 UTC (rev 79636)
+++ grok/branches/philikon-grokcore.component/src/grok/__init__.py	2007-09-14 15:32:16 UTC (rev 79637)
@@ -36,8 +36,8 @@
 from grok.components import Application, Form, AddForm, EditForm, DisplayForm
 from grok.components import Indexes
 from grok.components import Permission, Role
-from grok.directive import (context, name, title, template, templatedir,
-                            provides, baseclass, global_utility, local_utility,
+from grok.directive import (title, template, templatedir, baseclass,
+                            global_utility, local_utility,
                             permissions, require, site)
 from grok.formlib import action, AutoFields, Fields
 from grok.util import url
@@ -45,6 +45,7 @@
 from grokcore.grok import grok, grok_component
 from grokcore.component import Adapter, MultiAdapter, GlobalUtility
 from grokcore.component import subscribe, adapter, implementer
+from grokcore.component import context, name, provides
 from martian.error import GrokError, GrokImportError
 
 # Our __init__ provides the grok API directly so using 'import grok' is enough.

Modified: grok/branches/philikon-grokcore.component/src/grok/directive.py
===================================================================
--- grok/branches/philikon-grokcore.component/src/grok/directive.py	2007-09-14 13:39:17 UTC (rev 79636)
+++ grok/branches/philikon-grokcore.component/src/grok/directive.py	2007-09-14 15:32:16 UTC (rev 79637)
@@ -103,12 +103,8 @@
         return args
 
 # Define grok directives
-name = SingleTextDirective('grok.name', ClassDirectiveContext())
 template = SingleTextDirective('grok.template', ClassDirectiveContext())
-context = InterfaceOrClassDirective('grok.context',
-                                    ClassOrModuleDirectiveContext())
 templatedir = SingleTextDirective('grok.templatedir', ModuleDirectiveContext())
-provides = InterfaceDirective('grok.provides', ClassDirectiveContext())
 baseclass = MarkerDirective('grok.baseclass', ClassDirectiveContext())
 global_utility = GlobalUtilityDirective('grok.global_utility',
                                         ModuleDirectiveContext())