From 53826adaf4e6b35a7c4065f9f8b3a6680dc18330 Mon Sep 17 00:00:00 2001
From: Jan-Jaap Driessen <janjaapdriessen+github@gmail.com>
Date: Mon, 14 May 2012 18:47:18 +0000
Subject: [PATCH] Integrate grokcore.resource into grok.

---
 buildout.cfg         | 4 ++++
 setup.py             | 1 +
 src/grok/__init__.py | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/buildout.cfg b/buildout.cfg
index de593682..57ef204c 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -13,6 +13,10 @@ versions = versions
 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 =
diff --git a/setup.py b/setup.py
index 5d593315..307e01fb 100644
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,7 @@ def read(*rnames):
         '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',
diff --git a/src/grok/__init__.py b/src/grok/__init__.py
index 1e2d9b94..67bc14bb 100644
--- a/src/grok/__init__.py
+++ b/src/grok/__init__.py
@@ -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