From b489ae6b1a19d3a694a94d05f8b3a6de82f3fbb9 Mon Sep 17 00:00:00 2001
From: Gauthier Bastien <g.bastien@imio.be>
Date: Thu, 21 Mar 2013 11:15:49 +0100
Subject: [PATCH] Adapted tests and corrected wrong imports

---
 setup.py                                           | 14 ++++++--------
 src/collective/z3cform/rolefield/configure.zcml    | 11 ++++++++++-
 .../rolefield/profiles/testing/metadata.xml        |  4 ++--
 src/collective/z3cform/rolefield/testing.zcml      |  4 +++-
 src/collective/z3cform/rolefield/tests.py          |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index 8b5a1b7..ba1d0a1 100644
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,9 @@ long_description = (
 
 
 setup(
-    name='collective.contact.plonegroup',
+    name='collective.z3cform.rolefield',
     version='0.1',
-    description="Organizations and functions combinations to create plone groups",
+    description="A field for managing local roles",
     long_description=long_description,
     # Get more from http://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
@@ -32,24 +32,22 @@ setup(
     ],
     keywords='',
     author='Ecreall, Entrouvert, IMIO',
-    author_email='s.geulette@imio.be',
-    url='http://pypi.python.org/pypi/collective.contact.plonegroup',
+    author_email='g.bastien@imio.be',
+    url='http://pypi.python.org/pypi/collective.z3cform.rolefield',
     license='GPL',
     packages=find_packages('src', exclude=['ez_setup']),
-    namespace_packages=['collective', 'collective.contact'],
+    namespace_packages=['collective', 'collective.z3cform'],
     package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'five.grok',
-        'plone.api',
         'setuptools',
-        'collective.contact.core',
     ],
     extras_require={
         'test': [
             'ecreall.helpers.testing',
             'plone.app.testing',
+            'plone.app.dexterity',
         ],
     },
     entry_points="""
diff --git a/src/collective/z3cform/rolefield/configure.zcml b/src/collective/z3cform/rolefield/configure.zcml
index 4318cb7..c9500ec 100644
--- a/src/collective/z3cform/rolefield/configure.zcml
+++ b/src/collective/z3cform/rolefield/configure.zcml
@@ -4,6 +4,15 @@
     xmlns:i18n="http://namespaces.zope.org/i18n"
     i18n_domain="collective.z3cform.rolefield">
 
-    <include package="plone.z3cform" />
+  <include package="plone.z3cform" />
+
+  <utility
+    component=".field.LocalRolesToPrincipalsHandler"
+    name="collective.z3cform.rolefield.LocalRolesToPrincipals"
+    />
+
+  <adapter
+    factory=".field.LocalRolesToPrincipalsDataManager"
+    />
 
 </configure>
diff --git a/src/collective/z3cform/rolefield/profiles/testing/metadata.xml b/src/collective/z3cform/rolefield/profiles/testing/metadata.xml
index 91193e3..2ba70d7 100644
--- a/src/collective/z3cform/rolefield/profiles/testing/metadata.xml
+++ b/src/collective/z3cform/rolefield/profiles/testing/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1</version>
+  <version>0001</version>
   <dependencies>
-    <dependency>profile-collective.contact.plonegroup:default</dependency>
+    <dependency>profile-plone.app.dexterity:default</dependency>
   </dependencies>
 </metadata>
\ No newline at end of file
diff --git a/src/collective/z3cform/rolefield/testing.zcml b/src/collective/z3cform/rolefield/testing.zcml
index 764bde6..f1b0d87 100644
--- a/src/collective/z3cform/rolefield/testing.zcml
+++ b/src/collective/z3cform/rolefield/testing.zcml
@@ -1,7 +1,9 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    i18n_domain="collective.contact.plonegroup">
+    i18n_domain="collective.z3cform.rolefield">
+
+    <include package="plone.app.dexterity"/>
 
     <include file="configure.zcml" />
 
diff --git a/src/collective/z3cform/rolefield/tests.py b/src/collective/z3cform/rolefield/tests.py
index 3200ad8..332b5d0 100644
--- a/src/collective/z3cform/rolefield/tests.py
+++ b/src/collective/z3cform/rolefield/tests.py
@@ -22,7 +22,7 @@ class TestFields(unittest.TestCase, BaseTest):
         self.portal = self.layer['portal']
 
     def _getTargetClass(self):
-        from collective.dms.basecontent._field import LocalRolesToPrincipals
+        from collective.z3cform.rolefield.field import LocalRolesToPrincipals
         return LocalRolesToPrincipals
 
     def _makeOne(self, *args, **kw):