# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1236023054 -3600
# Node ID 536e421b082bb496dd468d41775ee00ed2018c78
# Parent  cf1caf4600815bfdebeec32dbb992d2074c48059
import updates

diff -r cf1caf460081 -r 536e421b082b server/session.py
--- a/server/session.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/server/session.py	Mon Mar 02 20:44:14 2009 +0100
@@ -1,7 +1,7 @@
 """Repository users' and internal' sessions.
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
diff -r cf1caf460081 -r 536e421b082b sobjects/supervising.py
--- a/sobjects/supervising.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/sobjects/supervising.py	Mon Mar 02 20:44:14 2009 +0100
@@ -9,7 +9,7 @@
 
 from cubicweb import UnknownEid
 from cubicweb.selectors import none_rset
-from cubicweb.common.view import Component
+from cubicweb.view import Component
 from cubicweb.common.mail import format_mail
 from cubicweb.server.hooksmanager import Hook
 from cubicweb.server.hookhelper import SendMailOp
diff -r cf1caf460081 -r 536e421b082b web/views/dynimages.py
--- a/web/views/dynimages.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/dynimages.py	Mon Mar 02 20:44:14 2009 +0100
@@ -1,7 +1,7 @@
 """dynamically generated image views
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -14,7 +14,7 @@
 from yams import schema2dot as s2d
 
 from cubicweb.selectors import implements
-from cubicweb.common.view import EntityView, StartupView
+from cubicweb.view import EntityView, StartupView
 
 
 class RestrictedSchemaDotPropsHandler(s2d.SchemaDotPropsHandler):
diff -r cf1caf460081 -r 536e421b082b web/views/eproperties.py
--- a/web/views/eproperties.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/eproperties.py	Mon Mar 02 20:44:14 2009 +0100
@@ -2,7 +2,7 @@
 
 
 :organization: Logilab
-:copyright: 2007-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2007-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -14,7 +14,7 @@
 from cubicweb.selectors import (one_line_rset, none_rset, implements,
                                 match_user_groups, chainfirst, chainall)
 from cubicweb.utils import UStringIO
-from cubicweb.common.view import StartupView
+from cubicweb.view import StartupView
 from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param, stdmsgs
 from cubicweb.web.views import baseviews
 from cubicweb.web.form import FormMixIn
diff -r cf1caf460081 -r 536e421b082b web/views/error.py
--- a/web/views/error.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/error.py	Mon Mar 02 20:44:14 2009 +0100
@@ -2,12 +2,12 @@
 as startup views and are used for standard error pages (404, 500, etc.)
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
 
-from cubicweb.common.view import StartupView
+from cubicweb.view import StartupView
 
 class FourOhFour(StartupView):
     id = '404'
diff -r cf1caf460081 -r 536e421b082b web/views/ibreadcrumbs.py
--- a/web/views/ibreadcrumbs.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/ibreadcrumbs.py	Mon Mar 02 20:44:14 2009 +0100
@@ -9,10 +9,10 @@
 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.entity import Entity
+from cubicweb.view import EntityView
 from cubicweb.common.uilib import cut
 from cubicweb.web.component import EntityVComponent
 
diff -r cf1caf460081 -r 536e421b082b web/views/igeocodable.py
--- a/web/views/igeocodable.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/igeocodable.py	Mon Mar 02 20:44:14 2009 +0100
@@ -9,7 +9,7 @@
 import simplejson
 
 from cubicweb.interfaces import IGeocodable
-from cubicweb.common.view import EntityView
+from cubicweb.view import EntityView
 from cubicweb.selectors import implements
 
 class GeocodingJsonView(EntityView):
diff -r cf1caf460081 -r 536e421b082b web/views/iprogress.py
--- a/web/views/iprogress.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/iprogress.py	Mon Mar 02 20:44:14 2009 +0100
@@ -12,7 +12,7 @@
 from cubicweb.selectors import implements, accept
 from cubicweb.interfaces import IProgress, IMileStone
 from cubicweb.schema import display_name
-from cubicweb.common.view import EntityView
+from cubicweb.view import EntityView
 from cubicweb.web.htmlwidgets import ProgressBarWidget
 
 
diff -r cf1caf460081 -r 536e421b082b web/views/magicsearch.py
--- a/web/views/magicsearch.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/magicsearch.py	Mon Mar 02 20:44:14 2009 +0100
@@ -15,7 +15,7 @@
 from rql.nodes import Relation
 
 from cubicweb import Unauthorized
-from cubicweb.common.view import Component
+from cubicweb.view import Component
 
 LOGGER = getLogger('cubicweb.magicsearch')
 
diff -r cf1caf460081 -r 536e421b082b web/views/massmailing.py
--- a/web/views/massmailing.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/massmailing.py	Mon Mar 02 20:44:14 2009 +0100
@@ -11,7 +11,7 @@
 
 from cubicweb.interfaces import IEmailable
 from cubicweb.selectors import implements, match_user_groups
-from cubicweb.common.view import EntityView
+from cubicweb.view import EntityView
 from cubicweb.web.action import Action
 from cubicweb.web import stdmsgs
 
diff -r cf1caf460081 -r 536e421b082b web/views/owl.py
--- a/web/views/owl.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/owl.py	Mon Mar 02 20:44:14 2009 +0100
@@ -1,7 +1,14 @@
+"""produces some Ontology Web Language schema and views
+
+:organization: Logilab
+:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
+"""
+__docformat__ = "restructuredtext en"
+
 from logilab.mtconverter import TransformError, xml_escape
 
-from cubicweb.common.view import StartupView
-from cubicweb.common.view import EntityView
+from cubicweb.view import StartupView, EntityView
 
 _ = unicode
 
diff -r cf1caf460081 -r 536e421b082b web/views/timeline.py
--- a/web/views/timeline.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/timeline.py	Mon Mar 02 20:44:14 2009 +0100
@@ -14,10 +14,9 @@
 
 from cubicweb.interfaces import ICalendarable
 from cubicweb.selectors import implements
-from cubicweb.common.view import EntityView, StartupView
+from cubicweb.view import EntityView, StartupView
 
 
-# 
 class TimelineJsonView(EntityView):
     """generates a json file to feed Timeline.loadJSON()
     NOTE: work in progress (image_url, bubbleUrl and so on
diff -r cf1caf460081 -r 536e421b082b web/views/wdoc.py
--- a/web/views/wdoc.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/wdoc.py	Mon Mar 02 20:44:14 2009 +0100
@@ -1,7 +1,7 @@
 """inline help system, using ReST file in products `wdoc` directory
 
 :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"
@@ -16,7 +16,7 @@
 from logilab.mtconverter import CHARSET_DECL_RGX
 
 from cubicweb.selectors import match_form_params
-from cubicweb.common.view import StartupView
+from cubicweb.view import StartupView
 from cubicweb.common.uilib import rest_publish
 from cubicweb.web import NotFound
 
diff -r cf1caf460081 -r 536e421b082b web/views/wfentities.py
--- a/web/views/wfentities.py	Mon Mar 02 20:43:58 2009 +0100
+++ b/web/views/wfentities.py	Mon Mar 02 20:44:14 2009 +0100
@@ -9,7 +9,7 @@
 from logilab.mtconverter import html_escape
 
 from cubicweb.selectors import implements
-from cubicweb.common.view import EntityView
+from cubicweb.view import EntityView
 
 class CellView(EntityView):
     id = 'cell'