[Checkins] SVN: grok/branches/janjaapdriessen-grokcore-resource/ Integrate grokcore.resource into grok.

[Jan-Jaap Driessen]

Log message for revision 125867:
  Integrate grokcore.resource into grok.

Changed:
  U   grok/branches/janjaapdriessen-grokcore-resource/buildout.cfg
  U   grok/branches/janjaapdriessen-grokcore-resource/setup.py
  U   grok/branches/janjaapdriessen-grokcore-resource/src/grok/__init__.py

-=-
Modified: grok/branches/janjaapdriessen-grokcore-resource/buildout.cfg
===================================================================
--- grok/branches/janjaapdriessen-grokcore-resource/buildout.cfg	2012-05-14 18:30:54 UTC (rev 125866)
+++ grok/branches/janjaapdriessen-grokcore-resource/buildout.cfg	2012-05-14 18:47:18 UTC (rev 125867)
@@ -13,7 +13,11 @@
 extensions =
   buildout.dumppickedversions
   mr.developer
+auto-checkout = grokcore.resource
 
+[sources]
+grokcore.resource = svn svn+ssh://svn.zope.org/repos/main/grokcore.resource/trunk
+
 [versions]
 grok =
 

Modified: grok/branches/janjaapdriessen-grokcore-resource/setup.py
===================================================================
--- grok/branches/janjaapdriessen-grokcore-resource/setup.py	2012-05-14 18:30:54 UTC (rev 125866)
+++ grok/branches/janjaapdriessen-grokcore-resource/setup.py	2012-05-14 18:47:18 UTC (rev 125867)
@@ -51,6 +51,7 @@
         'grokcore.layout >= 1.6',
         'grokcore.message',
         'grokcore.rest >= 1.3',
+        'grokcore.resource',
         'grokcore.security[role] >= 1.6',
         'grokcore.site >= 1.6.1',
         'grokcore.traverser >= 1.1',

Modified: grok/branches/janjaapdriessen-grokcore-resource/src/grok/__init__.py
===================================================================
--- grok/branches/janjaapdriessen-grokcore-resource/src/grok/__init__.py	2012-05-14 18:30:54 UTC (rev 125866)
+++ grok/branches/janjaapdriessen-grokcore-resource/src/grok/__init__.py	2012-05-14 18:47:18 UTC (rev 125867)
@@ -133,6 +133,8 @@
 from grokcore.rest import REST
 from grokcore.rest import restskin
 
+from grok.resource import resources
+
 # BBB These two functions are meant for test fixtures and should be
 # imported from grok.testing, not from grok.
 from grok.testing import grok, grok_component