--- a/entities/__init__.py	Tue Feb 17 22:43:59 2009 +0100
+++ b/entities/__init__.py	Tue Feb 17 22:49:54 2009 +0100
@@ -12,8 +12,8 @@
 from logilab.common.decorators import cached
 
 from cubicweb import Unauthorized, typed_eid
+from cubicweb.entity import Entity
 from cubicweb.common.utils import dump_class
-from cubicweb.common.entity import Entity
 from cubicweb.schema import FormatConstraint
 
 from cubicweb.interfaces import IBreadCrumbs, IFeed

--- a/entities/lib.py	Tue Feb 17 22:43:59 2009 +0100
+++ b/entities/lib.py	Tue Feb 17 22:49:54 2009 +0100
@@ -11,7 +11,7 @@
 
 from logilab.common.decorators import cached
 
-from cubicweb.common.entity import _marker
+from cubicweb.entity import _marker
 from cubicweb.entities import AnyEntity, fetch_config
 
 def mangle_email(address):

--- a/goa/db.py	Tue Feb 17 22:43:59 2009 +0100
+++ b/goa/db.py	Tue Feb 17 22:49:54 2009 +0100
@@ -25,7 +25,7 @@
 * XXX ListProperty
 
 :organization: Logilab
-:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -37,7 +37,7 @@
 
 from cubicweb import RequestSessionMixIn, Binary, entities
 from cubicweb.rset import ResultSet
-from cubicweb.common.entity import metaentity
+from cubicweb.entity import metaentity
 from cubicweb.server.utils import crypt_password
 from cubicweb.goa import use_mx_for_dates, mx2datetime, MODE
 from cubicweb.goa.dbinit import init_relations

--- a/goa/goactl.py	Tue Feb 17 22:43:59 2009 +0100
+++ b/goa/goactl.py	Tue Feb 17 22:49:54 2009 +0100
@@ -1,7 +1,7 @@
 """cubicweb on appengine plugins for cubicweb-ctl
 
 :organization: Logilab
-:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -50,6 +50,7 @@
     'dbapi.py',
     'cwvreg.py',
     'cwconfig.py',
+    'entity.py',
     'interfaces.py',
     'rset.py',
     'schema.py',
@@ -58,7 +59,6 @@
     'vregistry.py',
     
     'common/appobject.py',
-    'common/entity.py',
     'common/html4zope.py',
     'common/mail.py',
     'common/migration.py',

--- a/server/checkintegrity.py	Tue Feb 17 22:43:59 2009 +0100
+++ b/server/checkintegrity.py	Tue Feb 17 22:49:54 2009 +0100
@@ -84,7 +84,7 @@
           ', '.join(sorted(str(e) for e in etypes))
     pb = ProgressBar(len(etypes) + 1)
     # first monkey patch Entity.check to disable validation
-    from cubicweb.common.entity import Entity
+    from cubicweb.entity import Entity
     _check = Entity.check
     Entity.check = lambda self, creation=False: True
     # clear fti table first

--- a/web/views/ibreadcrumbs.py	Tue Feb 17 22:43:59 2009 +0100
+++ b/web/views/ibreadcrumbs.py	Tue Feb 17 22:49:54 2009 +0100
@@ -8,12 +8,12 @@
 
 from logilab.mtconverter import html_escape
 
+# don't use AnyEntity since this may cause bug with isinstance() due to reloading
+from cubicweb.entity import Entity
 from cubicweb.interfaces import IBreadCrumbs
 from cubicweb.selectors import match_context_prop, one_line_rset, implements
 from cubicweb.common.view import EntityView
 from cubicweb.common.uilib import cut
-# don't use AnyEntity since this may cause bug with isinstance() due to reloading
-from cubicweb.common.entity import Entity
 from cubicweb.web.component import EntityVComponent
 
 _ = unicode