[Checkins] SVN: z3c.relationfieldui/trunk/src/z3c/relationfieldui/ Make this work again after the changes in z3c.relationfield.

[Martijn Faassen]

Log message for revision 92322:
  Make this work again after the changes in z3c.relationfield.
  

Changed:
  U   z3c.relationfieldui/trunk/src/z3c/relationfieldui/README.txt
  U   z3c.relationfieldui/trunk/src/z3c/relationfieldui/configure.zcml
  U   z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml
  U   z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftests.py

-=-
Modified: z3c.relationfieldui/trunk/src/z3c/relationfieldui/README.txt
===================================================================
--- z3c.relationfieldui/trunk/src/z3c/relationfieldui/README.txt	2008-10-17 16:46:56 UTC (rev 92321)
+++ z3c.relationfieldui/trunk/src/z3c/relationfieldui/README.txt	2008-10-17 16:52:44 UTC (rev 92322)
@@ -22,8 +22,20 @@
 from ``b`` to ``a``::
 
   >>> root = getRootFolder()['root'] = TestApp()
+  >>> from zope.app.component.site import LocalSiteManager
+  >>> root.setSiteManager(LocalSiteManager(root))
   >>> from zope.app.component.hooks import setSite
   >>> setSite(root)
+  >>> from zope.app.intid import IntIds
+  >>> from zope.app.intid.interfaces import IIntIds
+  >>> root['intids'] = intids = IntIds() 
+  >>> sm = root.getSiteManager()
+  >>> sm.registerUtility(intids, provided=IIntIds)
+  >>> from z3c.relationfield import RelationCatalog
+  >>> from zc.relation.interfaces import ICatalog
+  >>> root['catalog'] = catalog = RelationCatalog()
+  >>> sm.registerUtility(catalog, provided=ICatalog)
+
   >>> root['a'] = Item()
   >>> from z3c.relationfield import RelationValue
   >>> b = Item()

Modified: z3c.relationfieldui/trunk/src/z3c/relationfieldui/configure.zcml
===================================================================
--- z3c.relationfieldui/trunk/src/z3c/relationfieldui/configure.zcml	2008-10-17 16:46:56 UTC (rev 92321)
+++ z3c.relationfieldui/trunk/src/z3c/relationfieldui/configure.zcml	2008-10-17 16:52:44 UTC (rev 92322)
@@ -2,8 +2,7 @@
   xmlns="http://namespaces.zope.org/zope"
   xmlns:grok="http://namespaces.zope.org/grok">
 
-  <include package="grok" file="meta.zcml" />
-  <include package="grok" />
+  <include package="grokcore.component" file="meta.zcml" />
   <include package="z3c.relationfield" />
 
   <grok:grok package="."/>

Modified: z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml
===================================================================
--- z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml	2008-10-17 16:46:56 UTC (rev 92321)
+++ z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml	2008-10-17 16:52:44 UTC (rev 92322)
@@ -2,10 +2,17 @@
    xmlns="http://namespaces.zope.org/zope"
    xmlns:grok="http://namespaces.zope.org/grok"
    i18n_domain="z3c.relationfield"
-   package="z3c.relationfield"
+   package="z3c.relationfieldui"
    >
 
-  <include package="grok" />
+  <include package="zope.app.zcmlfiles" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
+
+  <include package="zope.app.zcmlfiles" />
+  <include package="zope.app.authentication" />
+  <include package="zope.app.keyreference" />
+  <include package="zope.app.intid" />
+
   <include package="z3c.relationfieldui" />
 
   <!-- Typical functional testing security setup -->

Modified: z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftests.py
===================================================================
--- z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftests.py	2008-10-17 16:46:56 UTC (rev 92321)
+++ z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftests.py	2008-10-17 16:52:44 UTC (rev 92322)
@@ -2,7 +2,12 @@
 
 import grok
 
+from persistent import Persistent
+
 import zope.interface
+from zope.interface import implements
+from zope.app.component.site import SiteManagerContainer
+from zope.app.container.btree import BTreeContainer
 
 from zope.app.intid import IntIds
 from zope.app.intid.interfaces import IIntIds
@@ -19,21 +24,20 @@
     """Test fixture used by README.txt
     """
     rel = Relation(title=u"Relation")
- 
-class Item(grok.Model):
+
+class Item(Persistent):
     """Test fixture used by README.txt
     """
-    grok.implements(IItem, IHasRelations)
+    implements(IItem, IHasRelations)
 
     def __init__(self):
         self.rel = None
 
-class TestApp(grok.Application, grok.Container):
+class TestApp(SiteManagerContainer, BTreeContainer):
     """Test fixture used by README.txt.
     """
-    grok.local_utility(IntIds, provides=IIntIds)
-    grok.local_utility(RelationCatalog, provides=ICatalog)
-  
+    pass
+
 def test_suite():
     globs = { 'TestApp': TestApp, 'IItem': IItem, 'Item': Item }
     readme = FunctionalDocFileSuite(