Author: jmorliaguet
Date: Thu May 4 00:50:26 2006
New Revision: 3041
Modified:
cpsskins/branches/paris-sprint-2006/caching.py
cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/displays/metadirectives.py
cpsskins/branches/paris-sprint-2006/configuration/engines/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/fields/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/fields/metadirectives.py
cpsskins/branches/paris-sprint-2006/configuration/filters/metadirectives.py
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/formats/metadirectives.py
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metadirectives.py
cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/portlets/metadirectives.py
cpsskins/branches/paris-sprint-2006/configuration/settings/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/settings/metadirectives.py
cpsskins/branches/paris-sprint-2006/configure.zcml
cpsskins/branches/paris-sprint-2006/elements/cell.py
cpsskins/branches/paris-sprint-2006/elements/configure.zcml
cpsskins/branches/paris-sprint-2006/elements/pageblock.py
cpsskins/branches/paris-sprint-2006/elements/slot.py
cpsskins/branches/paris-sprint-2006/elements/theme.py
cpsskins/branches/paris-sprint-2006/elements/themepage.py
cpsskins/branches/paris-sprint-2006/perspectives/configure.zcml
cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
cpsskins/branches/paris-sprint-2006/setup/registration.py
cpsskins/branches/paris-sprint-2006/setup/snapshot.py
cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/fields/color.py
cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml
cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/formats/effect.py
cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
cpsskins/branches/paris-sprint-2006/standard/formats/style.py
cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
cpsskins/branches/paris-sprint-2006/standard/io/setting.py
cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml
cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml
cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml
cpsskins/branches/paris-sprint-2006/standard/negotiation/theme.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
Log:
- simplification: factory components are create in ZCML handlers when possible
Modified: cpsskins/branches/paris-sprint-2006/caching.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/caching.py (original)
+++ cpsskins/branches/paris-sprint-2006/caching.py Thu May 4 00:50:26 2006
@@ -19,6 +19,7 @@
from zope.app.cache.interfaces.ram import IRAMCache
from zope.app.cache.ram import RAMCache
+from zope.component.factory import Factory
from zope.interface import implements
cache = RAMCache()
@@ -42,3 +43,4 @@
def __setitem__(self, key, value):
cache.set(value, IMAGE_CACHE_ID, {'key': key})
+ImageCacheFactory = Factory(ImageCache)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -22,6 +22,7 @@
from zope.component.zcml import adapter, utility, interface
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
+from zope.component.factory import Factory
from zope.component.interface import provideInterface
from zope.component.interfaces import IFactory
from zope.component import queryUtility
@@ -32,7 +33,7 @@
from cpsskins.elements.interfaces import IDisplay
from cpsskins.setup.interfaces import IResourceType, INameType
-def display(_context, name=u'', schema=None, factory=None):
+def display(_context, name=u'', schema=None, class_=None):
if not name:
raise ConfigurationError("Must specify the display name.")
@@ -49,18 +50,17 @@
raise ConfigurationError, \
"Must specify the display schema."
- if not factory:
- raise ConfigurationError("Must specify a display factory.")
-
# zope:content
- c = ClassDirective(_context=_context, class_=factory)
+ c = ClassDirective(_context=_context, class_=class_)
c.implements(_context=_context,interface=(IAttributeAnnotatable,))
c.require(_context=_context, permission="zope.View", interface=(schema,))
c.require(_context=_context, permission="zope.ManageContent",
set_schema=(schema,))
+ factory=Factory(class_)
+
# zope:adapter
- adapter(_context=_context, factory=(factory,), provides=schema,
+ adapter(_context=_context, factory=(class_,), provides=schema,
for_=(IDisplay,), name=name)
# register the display factory
Modified:
cpsskins/branches/paris-sprint-2006/configuration/displays/metadirectives.py
==============================================================================
---
cpsskins/branches/paris-sprint-2006/configuration/displays/metadirectives.py
(original)
+++
cpsskins/branches/paris-sprint-2006/configuration/displays/metadirectives.py
Thu May 4 00:50:26 2006
@@ -39,8 +39,8 @@
required=False,
)
- factory = GlobalObject(
- title=_(u"Factory"),
- description=_(u"The display's factory."),
+ class_ = GlobalObject(
+ title=_(u"Class"),
+ description=_(u"The display's content class."),
required=False,
)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/engines/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/engines/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/engines/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -23,6 +23,7 @@
from cpsskins import configuration
registered_utilities = []
+
def engine(_context, name, accesskeys=[]):
if name in registered_utilities:
Modified:
cpsskins/branches/paris-sprint-2006/configuration/fields/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/fields/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/fields/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -20,19 +20,23 @@
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
from zope.component import queryUtility
-from zope.component.zcml import utility
+from zope.component.factory import Factory
from zope.component.interfaces import IFactory
from zope.component.interface import provideInterface
+from zope.component.zcml import utility
from zope.interface import alsoProvides
from cpsskins import configuration
from cpsskins.setup.interfaces import IResourceType, INameType
-def field(_context, name=u'', schema=None, factory=None):
+def field(_context, name=u'', schema=None, class_=None):
if not name:
raise ConfigurationError("Must specify the field name.")
+ if not class_:
+ raise ConfigurationError("Must specify a class.")
+
if queryUtility(configuration.IField, name) is not None:
raise ConfigurationError, \
"A field type named '%s' has already been registered." % name
@@ -41,12 +45,11 @@
raise ConfigurationError, \
"Must specify the field schema."
- if not factory:
- raise ConfigurationError("Must specify a field factory.")
+ factory = Factory(class_)
- # register the format factory
+ # register the field factory
utility(_context=_context, provides=IFactory, component=factory,
- name=u'field-' + name)
+ name=u'cpsskins.field.%s' % name)
# set up interface types
alsoProvides(schema, IResourceType)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/fields/metadirectives.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/fields/metadirectives.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/fields/metadirectives.py
Thu May 4 00:50:26 2006
@@ -39,8 +39,8 @@
required=False,
)
- factory = GlobalObject(
- title=_(u"Factory"),
- description=_(u"The field's factory."),
+ class_ = GlobalObject(
+ title=_(u"Class"),
+ description=_(u"The field's content class."),
required=False,
)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/filters/metadirectives.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/filters/metadirectives.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/filters/metadirectives.py
Thu May 4 00:50:26 2006
@@ -46,8 +46,8 @@
)
factory = GlobalObject(
- title=_(u"Factory"),
- description=_(u"Filter factory."),
+ title=_(u"factory"),
+ description=_(u"Filter adapter."),
required=False,
)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -24,6 +24,7 @@
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
from zope.component import queryUtility
+from zope.component.factory import Factory
from zope.component.zcml import utility, interface
from zope.component.interfaces import IFactory
from zope.interface import alsoProvides
@@ -37,8 +38,7 @@
def getAbsolutePath(_context, file):
return os.path.abspath(str(_context.path(file)))
-def format(_context, name=u'', schema=None, class_=None, factory=None,
- predicate=None):
+def format(_context, name=u'', schema=None, class_=None, predicate=None):
if not name:
raise ConfigurationError("Must specify the format name.")
@@ -57,9 +57,6 @@
if not schema:
raise ConfigurationError("Must specify the format schema.")
- if not factory:
- raise ConfigurationError("Must specify a format factory.")
-
if not predicate:
raise ConfigurationError("Must specify a format predicate.")
@@ -71,6 +68,7 @@
set_schema=(schema,))
# register the format factory
+ factory=Factory(class_)
utility(_context=_context, provides=IFactory, component=factory,
name=u'cpsskins.format.%s' % name)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/formats/metadirectives.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/formats/metadirectives.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/formats/metadirectives.py
Thu May 4 00:50:26 2006
@@ -45,12 +45,6 @@
required=False,
)
- factory = GlobalObject(
- title=_(u"Factory"),
- description=_(u"The format's factory."),
- required=False,
- )
-
predicate = GlobalObject(
title=_(u"Predicate"),
description=_(u"Predicate"),
Modified:
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metaconfigure.py
==============================================================================
---
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metaconfigure.py
(original)
+++
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -47,26 +47,26 @@
st.addChain(self.chain, name)
- def scheme(self, _context, factory=None, interface=None):
+ def scheme(self, _context, class_=None, interface=None):
if not interface:
raise ConfigurationError("Must specify a negotiation scheme.")
# add the negotiation scheme to the chain
self.chain.add(interface)
- return scheme(_context, name=self.name, factory=factory,
+ return scheme(_context, name=self.name, class_=class_,
interface=interface)
-def scheme(_context, name=u'', factory=None, interface=None):
+def scheme(_context, name=u'', class_=None, interface=None):
- if not factory:
- raise ConfigurationError("Must specify a negotiation scheme factory.")
+ if not class_:
+ raise ConfigurationError("Must specify a negotiation scheme class.")
if not interface.extends(INegotiationScheme):
raise ConfigurationError(
"A negotiation scheme must extend INegotiationScheme.")
- if not INegotiationScheme.implementedBy(factory):
+ if not INegotiationScheme.implementedBy(class_):
raise ConfigurationError(
"A negotiation scheme must implement INegotiationScheme.")
@@ -74,6 +74,6 @@
adapts = (None, IThemeManagementFolder, IBrowserRequest)
# zope:adapter
- adapter(_context=_context, factory=(factory,), provides=interface,
+ adapter(_context=_context, factory=(class_,), provides=interface,
for_=adapts, name=name)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metadirectives.py
==============================================================================
---
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metadirectives.py
(original)
+++
cpsskins/branches/paris-sprint-2006/configuration/negotiation/metadirectives.py
Thu May 4 00:50:26 2006
@@ -40,9 +40,9 @@
class INegotiationSchemeDirective(Interface):
- factory = GlobalObject(
- title=_(u"The negotiation scheme factory"),
- description=_(u"The factory used to create the negotiation scheme."),
+ class_ = GlobalObject(
+ title=_(u"The negotiation scheme class"),
+ description=_(u"The class used to create the negotiation scheme."),
required=False,
)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -26,6 +26,7 @@
from zope.app.publisher.browser.menumeta import addMenuItem
from zope.app.publisher.browser.resourcemeta import resource
from zope.app.content.interfaces import IContentType
+from zope.component.factory import Factory
from zope.component.interface import provideInterface
from zope.component.interfaces import IFactory
from zope.component.zcml import utility
@@ -38,7 +39,7 @@
ui_path = os.path.dirname(ui.__file__)
-def portlet(_context, name=None, title=None, description=None, factory=None,
+def portlet(_context, name=None, title=None, description=None, class_=None,
schema=None, icon=None):
if not name:
@@ -50,12 +51,12 @@
if not description:
raise ConfigurationError("Must specify a portlet description.")
- if not factory:
- raise ConfigurationError("Must specify a portlet factory.")
-
if not schema:
raise ConfigurationError("Must specify a portlet schema.")
+ if not class_:
+ raise ConfigurationError("Must specify a portlet class.")
+
if not icon:
raise ConfigurationError("Must specify a portlet icon.")
@@ -69,17 +70,18 @@
# browser:addMenuItem
from zope.app.menus import cpsskins_add_portlet
addMenuItem(_context=_context, menu=cpsskins_add_portlet, for_=Interface,
- title=title, description=description, class_=factory,
+ title=title, description=description, class_=class_,
permission="zope.ManageContent", icon=icon_name)
# zope:content
- c = ClassDirective(_context=_context, class_=factory)
+ c = ClassDirective(_context=_context, class_=class_)
c.implements(_context=_context,interface=(schema, IAttributeAnnotatable))
c.require(_context=_context, permission="zope.View",
interface=(schema, IUpdateData))
c.require(_context=_context, permission="zope.ManageContent",
set_schema=(schema, IUpdateData))
+ factory=Factory(class_)
# register the portlet factory
utility(_context=_context, provides=IFactory, component=factory,
name=u'cpsskins.portlet.%s' % name)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/portlets/metadirectives.py
==============================================================================
---
cpsskins/branches/paris-sprint-2006/configuration/portlets/metadirectives.py
(original)
+++
cpsskins/branches/paris-sprint-2006/configuration/portlets/metadirectives.py
Thu May 4 00:50:26 2006
@@ -53,9 +53,9 @@
required=False,
)
- factory = GlobalObject(
- title=_(u"Factory"),
- description=_(u"Factory for creating the portlet"),
+ class_ = GlobalObject(
+ title=_(u"class"),
+ description=_(u"The portlet's content class."),
required=False,
)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/settings/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/settings/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/settings/metaconfigure.py
Thu May 4 00:50:26 2006
@@ -18,6 +18,7 @@
__docformat__ = "reStructuredText"
from zope.configuration.exceptions import ConfigurationError
+from zope.component.factory import Factory
from zope.component.interfaces import IFactory
from zope.component.zcml import utility
from zope.interface import alsoProvides
@@ -26,7 +27,7 @@
registered_utilities = []
-def setting(_context, name=u'', schema=None, factory=None):
+def setting(_context, name=u'', schema=None, class_=None):
if not name:
raise ConfigurationError("Must provide a setting name.")
@@ -35,13 +36,14 @@
raise ConfigurationError(
"The '%s' setting directive has already been registered." % name)
- if not factory:
- raise ConfigurationError("Must specify a resource factory.")
+ if not class_:
+ raise ConfigurationError("Must specify a resource class.")
if not schema:
raise ConfigurationError("Must specify a resource schema.")
- utility(_context=_context, provides=IFactory, component=factory, name=name)
+ factory = Factory(class_)
+ utility(_context=_context, provides=IFactory, factory=factory, name=name)
alsoProvides(schema, IResourceType)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/settings/metadirectives.py
==============================================================================
---
cpsskins/branches/paris-sprint-2006/configuration/settings/metadirectives.py
(original)
+++
cpsskins/branches/paris-sprint-2006/configuration/settings/metadirectives.py
Thu May 4 00:50:26 2006
@@ -37,9 +37,9 @@
description=u"The schema of the resource",
)
- factory = GlobalObject(
- title=_(u"Factory"),
- description=_(u"The resource factory."),
+ class_ = GlobalObject(
+ title=_(u"Resource class"),
+ description=_(u"The resource content class."),
required=False,
)
Modified: cpsskins/branches/paris-sprint-2006/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/configure.zcml Thu May 4 00:50:26 2006
@@ -51,7 +51,7 @@
<utility
name="cpsskins.cache.ImageCache"
- component=".caching.ImageCache"
+ factory=".caching.ImageCacheFactory"
provides="zope.component.interfaces.IFactory"
/>
Modified: cpsskins/branches/paris-sprint-2006/elements/cell.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/cell.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/cell.py Thu May 4
00:50:26 2006
@@ -18,6 +18,7 @@
__docformat__ = "reStructuredText"
from zope.interface import implements
+from zope.component.factory import Factory
from cpsskins.elements.element import InnerNode
from cpsskins.elements.interfaces import ICell
@@ -39,3 +40,4 @@
def __repr__(self):
return "Cell('%s')" % self.title
+CellFactory = Factory(Cell)
Modified: cpsskins/branches/paris-sprint-2006/elements/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/elements/configure.zcml Thu May 4
00:50:26 2006
@@ -153,7 +153,7 @@
<utility
name="cpsskins.canvas.theme"
- component="cpsskins.elements.theme.Theme"
+ component="cpsskins.elements.theme.ThemeFactory"
provides="zope.component.interfaces.IFactory"
/>
@@ -192,7 +192,7 @@
<utility
name="cpsskins.canvas.themepage"
- component="cpsskins.elements.themepage.ThemePage"
+ component="cpsskins.elements.themepage.ThemePageFactory"
provides="zope.component.interfaces.IFactory"
/>
@@ -261,7 +261,7 @@
<utility
name="cpsskins.canvas.pageblock"
- component="cpsskins.elements.pageblock.PageBlock"
+ component="cpsskins.elements.pageblock.PageBlockFactory"
provides="zope.component.interfaces.IFactory"
/>
@@ -331,7 +331,7 @@
<utility
name="cpsskins.canvas.cell"
- component="cpsskins.elements.cell.Cell"
+ component="cpsskins.elements.cell.CellFactory"
provides="zope.component.interfaces.IFactory"
/>
@@ -411,7 +411,7 @@
<utility
name="cpsskins.canvas.slot"
- component="cpsskins.elements.slot.Slot"
+ component="cpsskins.elements.slot.SlotFactory"
provides="zope.component.interfaces.IFactory"
/>
Modified: cpsskins/branches/paris-sprint-2006/elements/pageblock.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/pageblock.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/pageblock.py Thu May 4
00:50:26 2006
@@ -18,6 +18,7 @@
__docformat__ = "reStructuredText"
from zope.interface import implements
+from zope.component.factory import Factory
from cpsskins.elements.element import InnerNode
from cpsskins.elements.interfaces import IPageBlock
@@ -39,3 +40,4 @@
def __repr__(self):
return "PageBlock('%s')" % self.title
+PageBlockFactory = Factory(PageBlock)
Modified: cpsskins/branches/paris-sprint-2006/elements/slot.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/slot.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/slot.py Thu May 4
00:50:26 2006
@@ -19,6 +19,7 @@
from zope.interface import implements
from zope.component import adapts, getUtility
+from zope.component.factory import Factory
from cpsskins.elements.element import InnerNode
from cpsskins.elements.interfaces import ISlot, INode, INodeTraverser
@@ -137,3 +138,4 @@
def sublocations(self):
yield None
+SlotFactory = Factory(Slot)
Modified: cpsskins/branches/paris-sprint-2006/elements/theme.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/theme.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/theme.py Thu May 4
00:50:26 2006
@@ -18,6 +18,7 @@
__docformat__ = "reStructuredText"
from zope.component import adapts
+from zope.component.factory import Factory
from zope.component.persistentregistry import PersistentComponents
from zope.interface import implements
from zope.app.container.btree import BTreeContainer
@@ -86,3 +87,4 @@
"""
return [self.node.getDefaultPage()]
+ThemeFactory = Factory(Theme)
Modified: cpsskins/branches/paris-sprint-2006/elements/themepage.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/themepage.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/themepage.py Thu May 4
00:50:26 2006
@@ -19,6 +19,7 @@
from zope.interface import implements
from zope.component import getUtilitiesFor
+from zope.component.factory import Factory
from cpsskins.elements.element import InnerNode
from cpsskins.elements.interfaces import IThemePage
@@ -53,3 +54,4 @@
name = property(getPageName)
+ThemePageFactory = Factory(ThemePage)
Modified: cpsskins/branches/paris-sprint-2006/perspectives/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/perspectives/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/perspectives/configure.zcml Thu May
4 00:50:26 2006
@@ -51,8 +51,8 @@
<!-- register the 'perspective' setting -->
<cpsskins:setting
name="perspective"
- factory=".perspective.PerspectiveFactory"
schema=".interfaces.IPerspective"
+ class=".perspective.Perspective"
/>
Modified: cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
(original)
+++ cpsskins/branches/paris-sprint-2006/perspectives/perspective.py Thu May
4 00:50:26 2006
@@ -20,7 +20,6 @@
from xml.dom.minidom import parseString
from zope.component import adapts
-from zope.component.factory import Factory
from zope.interface import implements, implementedBy
from cpsskins.perspectives.interfaces import IPerspective
@@ -49,9 +48,6 @@
def __eq__(self, other):
return str(self) == other
-PerspectiveFactory = Factory(Perspective, "Perspective Factory",
- "Factory that creates Perspectives")
-
class Relatable(object):
"""This adapter makes perspectives relatable.
"""
Modified: cpsskins/branches/paris-sprint-2006/setup/registration.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/registration.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/registration.py Thu May 4
00:50:26 2006
@@ -25,9 +25,9 @@
from xml.dom.minidom import parse
from xml.parsers.expat import ExpatError
-from zope.component import getUtility, createObject
+from zope.component import getUtility, createObject, getMultiAdapter
-from cpsskins.setup.interfaces import IResourceManager, IResource
+from cpsskins.setup.interfaces import IResourceManager, IResource, IDOMAdapter
logger = logging.getLogger("cpsskins")
@@ -91,7 +91,7 @@
logger.debug("reloaded setting %s in %s", name, filename)
# load the data
- #getMultiAdapter(IDOMAdapter, (resource, resource_def)).load()
+ getMultiAdapter(IDOMAdapter, (resource, resource_def)).load()
return resource
Modified: cpsskins/branches/paris-sprint-2006/setup/snapshot.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/snapshot.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/snapshot.py Thu May 4
00:50:26 2006
@@ -27,6 +27,9 @@
class ISnapshot(IFile):
"""A site snapshot"""
+ def read():
+ """Return the file's data"""
+
class Snapshot(File, Contained):
"""A site snapshot"""
Modified: cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml
Thu May 4 00:50:26 2006
@@ -19,7 +19,7 @@
<cpsskins:display
name="area"
schema=".area.IArea"
- factory=".area.Area"
+ class=".area.Area"
/>
<!-- Box display -->
@@ -27,7 +27,7 @@
<cpsskins:display
name="box"
schema=".box.IBox"
- factory=".box.Box"
+ class=".box.Box"
/>
@@ -36,7 +36,7 @@
<cpsskins:display
name="boxgroup"
schema=".boxgroup.IBoxGroup"
- factory=".boxgroup.BoxGroup"
+ class=".boxgroup.BoxGroup"
/>
</configure>
Modified: cpsskins/branches/paris-sprint-2006/standard/fields/color.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/fields/color.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/fields/color.py Thu May
4 00:50:26 2006
@@ -19,7 +19,6 @@
from persistent import Persistent
-from zope.component.factory import Factory
from zope.interface import implements, Interface
from cpsskins.elements.element import Element
@@ -53,6 +52,3 @@
def rgb(self):
return "rgb(%s,%s,%s)" % self.color
-ColorFactory = Factory(Color, "Color Factory",
- "A Factory that creates colors")
-
Modified: cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml Thu May
4 00:50:26 2006
@@ -6,13 +6,13 @@
<cpsskins:field
name="color"
schema=".color.IColor"
- factory=".color.ColorFactory"
+ class=".color.Color"
/>
<cpsskins:setting
name="color"
schema=".color.IColor"
- factory=".color.ColorFactory"
+ class=".color.Color"
/>
</configure>
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml Thu May
4 00:50:26 2006
@@ -17,7 +17,6 @@
name="layout"
schema=".layout.ILayout"
class=".layout.Layout"
- factory=".layout.LayoutFactory"
predicate=".layout.hasLayout"
/>
@@ -26,7 +25,6 @@
name="style"
schema=".style.IStyle"
class=".style.Style"
- factory=".style.StyleFactory"
predicate=".style.hasStyle"
/>
@@ -35,7 +33,6 @@
name="widget"
schema=".widget.IWidget"
class=".widget.Widget"
- factory=".widget.WidgetFactory"
predicate=".widget.hasWidget"
/>
@@ -50,7 +47,6 @@
name="effect"
schema=".effect.IEffect"
class=".effect.Effect"
- factory=".effect.EffectFactory"
predicate=".effect.hasEffect"
/>
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/effect.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/effect.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/effect.py Thu May
4 00:50:26 2006
@@ -18,7 +18,6 @@
__docformat__ = "reStructuredText"
from persistent import Persistent
-from zope.component.factory import Factory
from zope.interface import implements, implementedBy
from zope.i18nmessageid import MessageFactory
from zope.schema import Choice, List, Int, Bool
@@ -78,6 +77,3 @@
def __repr__(self):
return "<Effect of type: %s>" % ', '.join(self.types)
-EffectFactory = Factory(Effect, "Effect Factory",
- "A Factory that creates Effects")
-
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/layout.py Thu May
4 00:50:26 2006
@@ -21,7 +21,6 @@
from persistent import Persistent
from zope.traversing.interfaces import ITraversable
-from zope.component.factory import Factory
from zope.interface import implements, implementedBy
from zope.interface.common.mapping import IMapping
@@ -89,6 +88,3 @@
has_key = __contains__
-LayoutFactory = Factory(Layout, "Layout Factory",
- "A Factory that creates Layouts")
-
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/style.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/style.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/style.py Thu May
4 00:50:26 2006
@@ -20,7 +20,6 @@
from BTrees.OOBTree import OOBTree
from persistent import Persistent
-from zope.component.factory import Factory
from zope.interface import implements, implementedBy
from zope.interface.common.mapping import IMapping
from zope.i18nmessageid import MessageFactory
@@ -150,5 +149,3 @@
__contains__ = has_key
-StyleFactory = Factory(Style, "Style Factory", "A Factory that creates Styles")
-
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/widget.py Thu May
4 00:50:26 2006
@@ -21,7 +21,6 @@
from zope.schema.interfaces import IVocabularyFactory
from zope.component import getUtilitiesFor
-from zope.component.factory import Factory
from zope.interface import implements, implementedBy, alsoProvides
from zope.i18nmessageid import MessageFactory
from zope.schema.vocabulary import SimpleVocabulary
@@ -60,9 +59,6 @@
def __repr__(self):
return "<Widget: %s>" % ', '.join(self.types)
-WidgetFactory = Factory(Widget, "Widget Factory",
- "A Factory that creates Widgets")
-
def WidgetsVocabulary(context):
"""A vocabulary that contains the list of widgets.
"""
Modified: cpsskins/branches/paris-sprint-2006/standard/io/setting.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/io/setting.py (original)
+++ cpsskins/branches/paris-sprint-2006/standard/io/setting.py Thu May 4
00:50:26 2006
@@ -39,7 +39,7 @@
setting_el = document.createElement(u'setting')
setting_el.setAttribute(u'name', context.name)
setting_el.setAttribute(u'title', context.title)
- setting_el.setAttribute(u'tyoe', IType(resource).getTypeName())
+ setting_el.setAttribute(u'type', IType(resource).name)
node.appendChild(setting_el)
# export the resource
@@ -50,5 +50,6 @@
def load(self):
context = self.context
node = self.node
- # TODO
+
+
Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml
Thu May 4 00:50:26 2006
@@ -4,7 +4,7 @@
<negotiationchain name="engine">
<scheme
- factory=".engine.Request"
+ class=".engine.Request"
interface=".interfaces.IRequestNegotiationScheme"
/>
Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml Thu May
4 00:50:26 2006
@@ -4,27 +4,27 @@
<negotiationchain name="page">
<scheme
- factory=".page.QueryParameter"
+ class=".page.QueryParameter"
interface=".interfaces.IQueryParameterNegotiationScheme"
/>
<scheme
- factory=".page.Cookie"
+ class=".page.Cookie"
interface=".interfaces.ICookieNegotiationScheme"
/>
<scheme
- factory=".page.Local"
+ class=".page.Local"
interface=".interfaces.ILocalNegotiationScheme"
/>
<scheme
- factory=".page.Default"
+ class=".page.Default"
interface=".interfaces.IDefaultNegotiationScheme"
/>
<scheme
- factory=".page.Context"
+ class=".page.Context"
interface=".interfaces.IContextNegotiationScheme"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml
Thu May 4 00:50:26 2006
@@ -4,7 +4,7 @@
<negotiationchain name="perspective">
<scheme
- factory=".perspective.Session"
+ class=".perspective.Session"
interface=".interfaces.ISessionNegotiationScheme"
/>
Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/theme.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/negotiation/theme.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/negotiation/theme.zcml Thu May
4 00:50:26 2006
@@ -4,27 +4,27 @@
<negotiationchain name="theme">
<scheme
- factory=".theme.QueryParameter"
+ class=".theme.QueryParameter"
interface=".interfaces.IQueryParameterNegotiationScheme"
/>
<scheme
- factory=".theme.Cookie"
+ class=".theme.Cookie"
interface=".interfaces.ICookieNegotiationScheme"
/>
<scheme
- factory=".theme.Local"
+ class=".theme.Local"
interface=".interfaces.ILocalNegotiationScheme"
/>
<scheme
- factory=".theme.Default"
+ class=".theme.Default"
interface=".interfaces.IDefaultNegotiationScheme"
/>
<scheme
- factory=".theme.Context"
+ class=".theme.Context"
interface=".interfaces.IContextNegotiationScheme"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
Thu May 4 00:50:26 2006
@@ -11,7 +11,7 @@
name="standard.actions"
title="Actions portlet"
description="A portlet that displays actions"
- factory=".portlet.Actions"
+ class=".portlet.Actions"
schema=".portlet.IActions"
icon="actions-icon.png"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
Thu May 4 00:50:26 2006
@@ -11,7 +11,7 @@
name="standard.breadcrumbs"
title="Breadcrumbs portlet"
description="A portlet that displays a navigation trail"
- factory=".portlet.Breadcrumbs"
+ class=".portlet.Breadcrumbs"
schema=".portlet.IBreadcrumbs"
icon="breadcrumbs-icon.png"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
Thu May 4 00:50:26 2006
@@ -11,7 +11,7 @@
name="standard.custom"
title="Custom portlet"
description="A portlet that displays a python, ZPT, DTML page"
- factory=".portlet.Custom"
+ class=".portlet.Custom"
schema=".portlet.ICustom"
icon="custom-icon.png"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
Thu May 4 00:50:26 2006
@@ -11,7 +11,7 @@
name="standard.dummy"
title="Dummy portlet"
description="A portlet for testing"
- factory=".portlet.Dummy"
+ class=".portlet.Dummy"
schema=".portlet.IDummy"
icon="dummy-icon.png"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
Thu May 4 00:50:26 2006
@@ -11,7 +11,7 @@
name="standard.image"
title="Image portlet"
description="A portlet that displays an image"
- factory=".portlet.Image"
+ class=".portlet.Image"
schema=".portlet.IImage"
icon="image-icon.png"
/>
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
Thu May 4 00:50:26 2006
@@ -12,7 +12,7 @@
name="standard.macroslot"
title="Macro slot portlet"
description="A portlet that displays the main content area of a page"
- factory=".portlet.MacroSlot"
+ class=".portlet.MacroSlot"
schema=".portlet.IMacroSlot"
icon="macroslot-icon.png"
/>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
