Author: jmorliaguet
Date: Mon Nov 21 21:57:31 2005
New Revision: 1917

Modified:
   cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
   cpsskins/branches/jmo-perspectives/browser/tree/slot.py
   cpsskins/branches/jmo-perspectives/browser/tree/views.py
   cpsskins/branches/jmo-perspectives/caching.py
   cpsskins/branches/jmo-perspectives/configuration/__init__.py
   cpsskins/branches/jmo-perspectives/controllers/cell.py
   cpsskins/branches/jmo-perspectives/controllers/controller.py
   cpsskins/branches/jmo-perspectives/controllers/pageblock.py
   cpsskins/branches/jmo-perspectives/controllers/portlet.py
   cpsskins/branches/jmo-perspectives/controllers/slot.py
   cpsskins/branches/jmo-perspectives/controllers/theme.py
   cpsskins/branches/jmo-perspectives/controllers/themepage.py
   cpsskins/branches/jmo-perspectives/elements/cell.py
   cpsskins/branches/jmo-perspectives/elements/display.py
   cpsskins/branches/jmo-perspectives/elements/format.py
   cpsskins/branches/jmo-perspectives/elements/presentation.py
   cpsskins/branches/jmo-perspectives/elements/slot.py
   cpsskins/branches/jmo-perspectives/elements/theme.py
   cpsskins/branches/jmo-perspectives/engines/default/filters/style/css.py
   cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py
   cpsskins/branches/jmo-perspectives/interfaces.py
   cpsskins/branches/jmo-perspectives/model/__init__.py
   cpsskins/branches/jmo-perspectives/relations/relations.py
   cpsskins/branches/jmo-perspectives/relations/tool.py
   cpsskins/branches/jmo-perspectives/storage/__init__.py
   cpsskins/branches/jmo-perspectives/storage/configure.zcml
   cpsskins/branches/jmo-perspectives/storage/displays.py
   cpsskins/branches/jmo-perspectives/storage/formats.py
   cpsskins/branches/jmo-perspectives/storage/interfaces.py
   cpsskins/branches/jmo-perspectives/storage/portlets.py
   cpsskins/branches/jmo-perspectives/storage/relations.py
   cpsskins/branches/jmo-perspectives/storage/resources.py
   cpsskins/branches/jmo-perspectives/storage/storage.py
   cpsskins/branches/jmo-perspectives/thememanager.py
Log:

- fixed import paths



Modified: cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/rendering/engine.py      
(original)
+++ cpsskins/branches/jmo-perspectives/browser/rendering/engine.py      Mon Nov 
21 21:57:31 2005
@@ -17,6 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
+import logging
+
 from zope.app import zapi
 from zope.app.publisher.browser import BrowserView
 from zope.app.traversing.api import getParent
@@ -25,19 +27,15 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.utils import getThemeManager, getContexts
+from cpsskins import configuration
 from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.rendering.interfaces import (
+    IUpdateData, IViewer, IRendererView, IFilterView, IContextInfo)
 from cpsskins.configuration.interfaces import IRegistry
-from cpsskins.elements.interfaces import IType
-from cpsskins.elements.interfaces import IElement, ILeaf, ISlot, IDisplayable
-from cpsskins.storage.interfaces import IRelationStorage
-from interfaces import IUpdateData, IViewer, IRendererView, IFilterView
-from interfaces import IContextInfo
-
-from cpsskins import configuration
-from cpsskins.elements.interfaces import INodeTraverser, INode
-
-import logging
+from cpsskins.elements.interfaces import (
+    IType, INodeTraverser, INode, IElement, ILeaf, ISlot, IDisplayable)
+from cpsskins.storage.relations import IRelationStorage
+from cpsskins.utils import getThemeManager, getContexts
 
 INFO = logging.INFO
 logger = logging.getLogger()
@@ -143,6 +141,7 @@
         contexts = getContexts(request)
 
         theme = getThemeManager().getThemeInContext(element)
+        # TODO:  move the relation storage to the parent folder
         relations = theme.getStorage(IRelationStorage)
         perspective = getMultiAdapter((element, request),
                                        INegociation).getPerspective()

Modified: cpsskins/branches/jmo-perspectives/browser/tree/slot.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/tree/slot.py     (original)
+++ cpsskins/branches/jmo-perspectives/browser/tree/slot.py     Mon Nov 21 
21:57:31 2005
@@ -30,9 +30,11 @@
 from cpsskins.relations import DyadicRelation, TriadicRelation
 from cpsskins.relations.tool import RelationTool
 from cpsskins.utils import getThemeManager
-from cpsskins.storage.interfaces import IPortletStorage, IRelationStorage
-from interfaces import INodeAdding, INodeRemoving, INodeOrdering, INodeMoving
-from interfaces import INodeDuplicating
+from cpsskins.storage.portlets import IPortletStorage
+from cpsskins.storage.relations import IRelationStorage
+from cpsskins.browser.tree.interfaces import (
+    INodeAdding, INodeRemoving, INodeOrdering, INodeMoving, INodeDuplicating
+    )
 
 class SlotAdding(Adding):
     """A view for adding elements into slots

Modified: cpsskins/branches/jmo-perspectives/browser/tree/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/tree/views.py    (original)
+++ cpsskins/branches/jmo-perspectives/browser/tree/views.py    Mon Nov 21 
21:57:31 2005
@@ -24,8 +24,9 @@
 from zope.app.traversing.api import getParent
 from zope.interface import implements
 
-from interfaces import INodeAdding, INodeRemoving, INodeOrdering, INodeMoving
-from interfaces import INodeDuplicating
+from cpsskins.browser.tree.interfaces import (
+    INodeAdding, INodeRemoving, INodeOrdering, INodeMoving, INodeDuplicating
+    )
 
 class NodeAdding(Adding):
     """A view for adding element into nodes

Modified: cpsskins/branches/jmo-perspectives/caching.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/caching.py       (original)
+++ cpsskins/branches/jmo-perspectives/caching.py       Mon Nov 21 21:57:31 2005
@@ -20,7 +20,7 @@
 from zope.app.cache.ram import RAMCache
 from zope.interface import implements
 
-from interfaces import IImageCache
+from cpsskins.interfaces import IImageCache
 
 cache = RAMCache()
 IMAGE_CACHE_ID = 'images'

Modified: cpsskins/branches/jmo-perspectives/configuration/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/__init__.py        
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/__init__.py        Mon Nov 
21 21:57:31 2005
@@ -23,16 +23,19 @@
 from BTrees.OOBTree import OOBTree
 from zope.interface import implements
 
-from interfaces import IRegistry
+from cpsskins.configuration.interfaces import IRegistry
+from cpsskins.configuration.displays.display import IDisplay, Display
+from cpsskins.configuration.engines.engine import IEngine, Engine
+from cpsskins.configuration.formats.format import IFormat, Format
+from cpsskins.configuration.filters.filter import IFilter, Filter
+from cpsskins.configuration.presentations.presentation import (
+    IPresentation, Presentation)
+from cpsskins.configuration.perspectives.perspective import (
+    IPerspective, Perspective)
+from cpsskins.configuration.renderers.renderer import IRenderer, Renderer
+from cpsskins.configuration.widgets.widget import IWidget, Widget
 
-from displays.display import IDisplay, Display
-from engines.engine import IEngine, Engine
-from formats.format import IFormat, Format
-from filters.filter import IFilter, Filter
-from presentations.presentation import IPresentation, Presentation
-from perspectives.perspective import IPerspective, Perspective
-from renderers.renderer import IRenderer, Renderer
-from widgets.widget import IWidget, Widget
+# TODO: this will go away (replaced with utilities)
 
 class ConfigurationRegistry(object):
     """Configuration registry

Modified: cpsskins/branches/jmo-perspectives/controllers/cell.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/cell.py      (original)
+++ cpsskins/branches/jmo-perspectives/controllers/cell.py      Mon Nov 21 
21:57:31 2005
@@ -20,9 +20,9 @@
 from zope.interface import implements
 
 from cpsskins.controllers import Controller
+from cpsskins.controllers.interfaces import IController
 from cpsskins.elements.interfaces import IPresentable
 from cpsskins.utils import getThemeManager
-from interfaces import IController
 
 class CellController(Controller):
     """Event handler for cells.

Modified: cpsskins/branches/jmo-perspectives/controllers/controller.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/controller.py        
(original)
+++ cpsskins/branches/jmo-perspectives/controllers/controller.py        Mon Nov 
21 21:57:31 2005
@@ -20,8 +20,8 @@
 from zope.app.copypastemove import dispatchToSublocations
 from zope.interface import implements
 
+from cpsskins.controllers.interfaces import IController
 from cpsskins.utils import getThemeManager
-from interfaces import IController
 
 class Controller(object):
     """Base controller with a set of handlers for the most common events.

Modified: cpsskins/branches/jmo-perspectives/controllers/pageblock.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/pageblock.py (original)
+++ cpsskins/branches/jmo-perspectives/controllers/pageblock.py Mon Nov 21 
21:57:31 2005
@@ -20,9 +20,9 @@
 from zope.interface import implements
 
 from cpsskins.controllers import Controller
-from cpsskins.utils import getThemeManager
+from cpsskins.controllers.interfaces import IController
 from cpsskins.elements.interfaces import IPresentable
-from interfaces import IController
+from cpsskins.utils import getThemeManager
 
 class PageBlockController(Controller):
     """Event handler for page blocks

Modified: cpsskins/branches/jmo-perspectives/controllers/portlet.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/portlet.py   (original)
+++ cpsskins/branches/jmo-perspectives/controllers/portlet.py   Mon Nov 21 
21:57:31 2005
@@ -21,10 +21,10 @@
 from zope.interface import implements
 
 from cpsskins.controllers import Controller
+from cpsskins.controllers.interfaces import IController
 from cpsskins.elements.interfaces import ICell
 from cpsskins.elements.interfaces import IPresentable
 from cpsskins.utils import getThemeManager
-from interfaces import IController
 
 class PortletController(Controller):
     """Event handler for portlets.

Modified: cpsskins/branches/jmo-perspectives/controllers/slot.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/slot.py      (original)
+++ cpsskins/branches/jmo-perspectives/controllers/slot.py      Mon Nov 21 
21:57:31 2005
@@ -20,9 +20,9 @@
 from zope.interface import implements
 
 from cpsskins.controllers import Controller
+from cpsskins.controllers.interfaces import IController
 from cpsskins.elements.interfaces import IDisplayable, IPresentable
 from cpsskins.utils import getThemeManager
-from interfaces import IController
 
 class SlotController(Controller):
     """Event handler for slots.

Modified: cpsskins/branches/jmo-perspectives/controllers/theme.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/theme.py     (original)
+++ cpsskins/branches/jmo-perspectives/controllers/theme.py     Mon Nov 21 
21:57:31 2005
@@ -21,9 +21,9 @@
 from zope.component import getUtility
 
 from cpsskins.controllers import Controller
+from cpsskins.controllers.interfaces import IController
 from cpsskins.configuration.interfaces import IRegistry
 from cpsskins.utils import getThemeManager
-from interfaces import IController
 
 storage_registry = getUtility(IRegistry, 'storages')
 

Modified: cpsskins/branches/jmo-perspectives/controllers/themepage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/controllers/themepage.py (original)
+++ cpsskins/branches/jmo-perspectives/controllers/themepage.py Mon Nov 21 
21:57:31 2005
@@ -20,9 +20,9 @@
 from zope.interface import implements
 
 from cpsskins.controllers import Controller
+from cpsskins.controllers.interfaces import IController
 from cpsskins.elements.interfaces import IPresentable
 from cpsskins.utils import getThemeManager
-from interfaces import IController
 
 class ThemePageController(Controller):
     """Event handler for theme pages.

Modified: cpsskins/branches/jmo-perspectives/elements/cell.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/cell.py (original)
+++ cpsskins/branches/jmo-perspectives/elements/cell.py Mon Nov 21 21:57:31 2005
@@ -20,7 +20,7 @@
 from zope.interface import implements
 
 from cpsskins.elements import InnerNode
-from interfaces import ICell
+from cpsskins.elements.interfaces import ICell
 
 class Cell(InnerNode):
     """Cell

Modified: cpsskins/branches/jmo-perspectives/elements/display.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/display.py      (original)
+++ cpsskins/branches/jmo-perspectives/elements/display.py      Mon Nov 21 
21:57:31 2005
@@ -27,13 +27,13 @@
 from cpsskins import configuration
 from cpsskins.elements import Element
 from cpsskins.elements.interfaces import IType
+from cpsskins.elements.interfaces import IDisplayable, IDisplay, IDisplayType
 from cpsskins.perspectives.interfaces import IPerspective
 from cpsskins.relations import DyadicRelation, TriadicRelation
 from cpsskins.relations.tool import RelationTool
 from cpsskins.ontology import hasDisplay, hasDisplayFromPerspective
-from cpsskins.storage.interfaces import IDisplayStorage
+from cpsskins.storage.displays import IDisplayStorage
 from cpsskins.utils import getThemeManager
-from interfaces import IDisplayable, IDisplay, IDisplayType
 
 class Display(Element):
 

Modified: cpsskins/branches/jmo-perspectives/elements/format.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/format.py       (original)
+++ cpsskins/branches/jmo-perspectives/elements/format.py       Mon Nov 21 
21:57:31 2005
@@ -30,7 +30,7 @@
 from cpsskins.relations import DyadicRelation
 from cpsskins.relations.tool import RelationTool
 from cpsskins.utils import getThemeManager
-from cpsskins.storage.interfaces import IFormatStorage
+from cpsskins.storage.formats import IFormatStorage
 
 class Format(Element):
 

Modified: cpsskins/branches/jmo-perspectives/elements/presentation.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/presentation.py (original)
+++ cpsskins/branches/jmo-perspectives/elements/presentation.py Mon Nov 21 
21:57:31 2005
@@ -22,11 +22,11 @@
 from zope.component import getUtility, queryUtility
 
 from cpsskins import configuration
-from cpsskins.elements.interfaces import IType, IDisplayable, IFormattable
+from cpsskins.elements.interfaces import (
+    IType, IDisplayable, IFormattable, IPresentable)
 from cpsskins.ontology import hasFormat, hasDisplay, hasDisplayFromPerspective
 from cpsskins.relations.tool import RelationTool
 from cpsskins.utils import getThemeManager
-from interfaces import IPresentable
 
 class Presentable(object):
     """This adapter makes elements presentable, i.e. displayable and 
formattable

Modified: cpsskins/branches/jmo-perspectives/elements/slot.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/slot.py (original)
+++ cpsskins/branches/jmo-perspectives/elements/slot.py Mon Nov 21 21:57:31 2005
@@ -25,7 +25,7 @@
 from cpsskins.ontology import hasPortlet, hasPortletFromPerspective
 from cpsskins.relations.tool import RelationTool
 from cpsskins.relations.interfaces import IRelatable
-from cpsskins.storage.interfaces import IPortletStorage
+from cpsskins.storage.portlets import IPortletStorage
 from cpsskins.utils import getThemeManager
 
 class Slot(InnerNode):

Modified: cpsskins/branches/jmo-perspectives/elements/theme.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/theme.py        (original)
+++ cpsskins/branches/jmo-perspectives/elements/theme.py        Mon Nov 21 
21:57:31 2005
@@ -22,9 +22,9 @@
 from zope.interface import implements
 
 from cpsskins.elements.interfaces import INode, INodeTraverser
+from cpsskins.elements.interfaces import ITheme, IThemePage
 from cpsskins.perspectives import Perspective
 from cpsskins.utils import getThemeManager
-from interfaces import ITheme, IThemePage
 from cpsskins.setup.interfaces import IResourceManager
 
 class Theme(SiteManagementFolder):

Modified: 
cpsskins/branches/jmo-perspectives/engines/default/filters/style/css.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/filters/style/css.py     
(original)
+++ cpsskins/branches/jmo-perspectives/engines/default/filters/style/css.py     
Mon Nov 21 21:57:31 2005
@@ -22,7 +22,7 @@
 
 from cpsskins.engines.default.formats.style import IStyle
 from cpsskins.engines.default.filters.style import ICSSRenderer
-from cpsskins.storage.interfaces import IFormatStorage
+from cpsskins.storage.formats import IFormatStorage
 from cpsskins.utils import getThemeManager
 
 class IStylesheetView(Interface):

Modified: 
cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py   
    (original)
+++ 
cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py   
    Mon Nov 21 21:57:31 2005
@@ -17,6 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
+import logging
+
 from zope.app.publisher.browser import BrowserView
 from zope.component import adapts
 from zope.component import queryMultiAdapter
@@ -27,8 +29,6 @@
 from cpsskins.engines.default.formats.interfaces import IWidget
 from interfaces import IBasicWidgetView, IWidgetView
 
-import logging
-
 INFO = logging.INFO
 DEBUG = logging.DEBUG
 logger = logging.getLogger()

Modified: cpsskins/branches/jmo-perspectives/interfaces.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/interfaces.py    (original)
+++ cpsskins/branches/jmo-perspectives/interfaces.py    Mon Nov 21 21:57:31 2005
@@ -17,10 +17,10 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.interface import Interface, Attribute
-from zope.interface.interfaces import IInterface
 from zope.app.cache.interfaces.ram import IRAMCache
+from zope.interface.interfaces import IInterface
 from zope.i18nmessageid import MessageFactory
+from zope.interface import Interface
 from zope.schema import Bool, TextLine
 
 from cpsskins.elements.interfaces import IElement, IPortlet, IDisplay, IFormat

Modified: cpsskins/branches/jmo-perspectives/model/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/model/__init__.py        (original)
+++ cpsskins/branches/jmo-perspectives/model/__init__.py        Mon Nov 21 
21:57:31 2005
@@ -21,10 +21,7 @@
 
 from zope.interface import implements
 
-from interfaces import IMetaData, IImage, IItems, IItem
-
-# Data encapsulators
-
+from cpsskins.model.interfaces import IMetaData, IImage, IItems, IItem
 
 class MetaData(object):
     """Meta-data structure

Modified: cpsskins/branches/jmo-perspectives/relations/relations.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/relations/relations.py   (original)
+++ cpsskins/branches/jmo-perspectives/relations/relations.py   Mon Nov 21 
21:57:31 2005
@@ -23,9 +23,10 @@
 from zope.interface import implements
 from zope.security.proxy import removeSecurityProxy as trusted
 
-from interfaces import IRelatable
-from interfaces import IProxyPredicate, IPredicate, ICompoundPredicate
-from interfaces import IMonadicRelation, IDyadicRelation, ITriadicRelation
+from cpsskins.relations.interfaces import (
+    IRelatable, IProxyPredicate, IPredicate, ICompoundPredicate,
+    IMonadicRelation, IDyadicRelation, ITriadicRelation,
+    )
 
 class Predicate:
     """A predicate is a group of marks.

Modified: cpsskins/branches/jmo-perspectives/relations/tool.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/relations/tool.py        (original)
+++ cpsskins/branches/jmo-perspectives/relations/tool.py        Mon Nov 21 
21:57:31 2005
@@ -19,8 +19,8 @@
 
 from zope.interface import implements
 
-from cpsskins.storage.interfaces import IRelationStorage
-from interfaces import IRelationTool
+from cpsskins.relations.interfaces import IRelationTool
+from cpsskins.storage.relations import IRelationStorage
 from cpsskins.utils import getThemeManager
 
 class RelationTool(object):

Modified: cpsskins/branches/jmo-perspectives/storage/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/__init__.py      (original)
+++ cpsskins/branches/jmo-perspectives/storage/__init__.py      Mon Nov 21 
21:57:31 2005
@@ -17,3 +17,4 @@
 """
 __docformat__ = "reStructuredText"
 
+from cpsskins.storage.storage import Storage

Modified: cpsskins/branches/jmo-perspectives/storage/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/configure.zcml   (original)
+++ cpsskins/branches/jmo-perspectives/storage/configure.zcml   Mon Nov 21 
21:57:31 2005
@@ -13,16 +13,7 @@
       title="Relation storage"
       description="A relation storage contains relations between objects"
       factory=".relations.RelationStorage"
-      interface=".interfaces.IRelationStorage"
-  />
-
-  <!-- Resource storage -->
-
-  <cpsskins:storage
-      id="resources"
-      title="Resource storage"
-      description="A resource storage contains resources (images, ...)"
-      factory=".resources.ResourceStorage"
+      interface=".relations.IRelationStorage"
   />
 
   <!-- Portlet storage -->

Modified: cpsskins/branches/jmo-perspectives/storage/displays.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/displays.py      (original)
+++ cpsskins/branches/jmo-perspectives/storage/displays.py      Mon Nov 21 
21:57:31 2005
@@ -20,16 +20,14 @@
 from zope.app.container.constraints import contains
 from zope.interface import implements
 
-from cpsskins.interfaces import IDisplay
-from storage import Storage
-from interfaces import IStorage
+from cpsskins.elements.interfaces import IDisplay
+from cpsskins.storage import Storage
+from cpsskins.storage.interfaces import IStorage
 
 class IDisplayStorage(IStorage):
-
     contains(IDisplay)
 
 class DisplayStorage(Storage):
     """A BTree-based display container"""
-
     implements(IDisplayStorage)
 

Modified: cpsskins/branches/jmo-perspectives/storage/formats.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/formats.py       (original)
+++ cpsskins/branches/jmo-perspectives/storage/formats.py       Mon Nov 21 
21:57:31 2005
@@ -21,15 +21,13 @@
 from zope.interface import implements
 
 from cpsskins.interfaces import IFormat
-from storage import Storage
-from interfaces import IStorage
+from cpsskins.storage import Storage
+from cpsskins.storage.interfaces import IStorage
 
 class IFormatStorage(IStorage):
-
     contains(IFormat)
 
 class FormatStorage(Storage):
     """A BTree-based display container"""
-
     implements(IFormatStorage)
 

Modified: cpsskins/branches/jmo-perspectives/storage/interfaces.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/interfaces.py    (original)
+++ cpsskins/branches/jmo-perspectives/storage/interfaces.py    Mon Nov 21 
21:57:31 2005
@@ -17,10 +17,20 @@
 """
 __docformat__ = "reStructuredText"
 
-from storage import IStorage
+from zope.interface import Interface, Attribute
+
+class IStorage(Interface):
+
+    def add(object):
+        """Add an object to the storage. Return the added object."""
+
+    def remove(objects):
+        """Remove an object from the storage."""
+
+    def duplicate(object):
+        """Duplicated an object in the storage.
+        Return the object of the duplication."""
+
+    def __setitem__(item):
+        """ """
 
-from displays import IDisplayStorage
-from formats import IFormatStorage
-from relations import IRelationStorage
-from portlets import IPortletStorage
-from resources import IResourceStorage

Modified: cpsskins/branches/jmo-perspectives/storage/portlets.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/portlets.py      (original)
+++ cpsskins/branches/jmo-perspectives/storage/portlets.py      Mon Nov 21 
21:57:31 2005
@@ -20,9 +20,9 @@
 from zope.app.container.constraints import contains
 from zope.interface import implements
 
-from cpsskins.interfaces import IPortlet
-from storage import Storage
-from interfaces import IStorage
+from cpsskins.elements.interfaces import IPortlet
+from cpsskins.storage import Storage
+from cpsskins.storage.interfaces import IStorage
 
 class IPortletStorage(IStorage):
 

Modified: cpsskins/branches/jmo-perspectives/storage/relations.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/relations.py     (original)
+++ cpsskins/branches/jmo-perspectives/storage/relations.py     Mon Nov 21 
21:57:31 2005
@@ -17,8 +17,9 @@
 """
 __docformat__ = "reStructuredText"
 
-from pprint import pprint
+import logging
 
+from pprint import pprint
 from BTrees.OOBTree import OOBTree
 
 from zope.app import zapi
@@ -33,10 +34,8 @@
 from cpsskins.relations import Predicate, CompoundPredicate
 from cpsskins.relations.interfaces import IRelation, IRelatable, IPredicate
 from cpsskins.relations.interfaces import IProxyPredicate
-from storage import Storage
-from interfaces import IStorage
-
-import logging
+from cpsskins.storage import Storage
+from cpsskins.storage.interfaces import IStorage
 
 DEBUG = logging.DEBUG
 logger = logging.getLogger()

Modified: cpsskins/branches/jmo-perspectives/storage/resources.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/resources.py     (original)
+++ cpsskins/branches/jmo-perspectives/storage/resources.py     Mon Nov 21 
21:57:31 2005
@@ -20,14 +20,13 @@
 from zope.app.container.constraints import contains
 from zope.interface import implements
 
-from storage import Storage
-from interfaces import IStorage
+from cpsskins.storage.interfaces import IStorage
+from cpsskins.storage.storage import Storage
 
 class IResourceStorage(IStorage):
     """Interface for resource storages."""
 
 class ResourceStorage(Storage):
     """A BTree-based resource container"""
-
     implements(IResourceStorage)
 

Modified: cpsskins/branches/jmo-perspectives/storage/storage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/storage/storage.py       (original)
+++ cpsskins/branches/jmo-perspectives/storage/storage.py       Mon Nov 21 
21:57:31 2005
@@ -29,21 +29,7 @@
 from zope.interface import implements, Interface
 
 from cpsskins.elements.interfaces import IElement
-
-class IStorage(Interface):
-
-    def add(object):
-        """Add an object to the storage. Return the added object."""
-
-    def remove(objects):
-        """Remove an object from the storage."""
-
-    def duplicate(object):
-        """Duplicated an object in the storage.
-        Return the object of the duplication."""
-
-    def __setitem__(item):
-        """ """
+from cpsskins.storage.interfaces import IStorage
 
 class Storage(BTreeContainer, Contained):
     """A base storage class"""

Modified: cpsskins/branches/jmo-perspectives/thememanager.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/thememanager.py  (original)
+++ cpsskins/branches/jmo-perspectives/thememanager.py  Mon Nov 21 21:57:31 2005
@@ -26,16 +26,16 @@
 from zope.component import queryUtility, getUtilitiesFor, getUtility
 from zope.interface import implements
 
-from caching import ImageCache
+from cpsskins.caching import ImageCache
 from cpsskins.setup.interfaces import ISettings
 from cpsskins.setup.settings import Settings
-from interfaces import IThemeManagement, IImageCache
-from elements.interfaces import ITheme, IThemeContainer, IThemePage
-from elements.interfaces import IFormattable
-from ontology import isDefault, hasFormat, hasDisplay
-from relations import MonadicRelation
-from relations.tool import RelationTool
-from storage.interfaces import IRelationStorage
+from cpsskins.interfaces import IThemeManagement, IImageCache
+from cpsskins.elements.interfaces import ITheme, IThemeContainer, IThemePage
+from cpsskins.elements.interfaces import IFormattable
+from cpsskins.ontology import isDefault, hasFormat, hasDisplay
+from cpsskins.relations import MonadicRelation
+from cpsskins.relations.tool import RelationTool
+from cpsskins.storage.relations import IRelationStorage
 
 def added(object, event):
     object.registerUtilities()
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to