Author: jmorliaguet
Date: Mon May 1 18:41:15 2006
New Revision: 3008
Modified:
cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/widgets/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configure.zcml
cpsskins/branches/paris-sprint-2006/elements/configure.zcml
cpsskins/branches/paris-sprint-2006/elements/format.py
cpsskins/branches/paris-sprint-2006/relations/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
Log:
- cleaned up factory names, so they can't clash with other applications
- relation and canvas element factories where not registered correctly.
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
Mon May 1 18:41:15 2006
@@ -61,11 +61,11 @@
# zope:adapter
adapter(_context=_context, factory=(factory,), provides=schema,
- for_=(IDisplay,), name=u'display-' + name)
+ for_=(IDisplay,), name=name)
# register the display factory
utility(_context=_context, provides=IFactory, component=factory,
- name=u'display-' + name)
+ name=u'cpsskins.display.%s' % name)
# register the display
utility(_context=_context, provides=configuration.IDisplay,
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
Mon May 1 18:41:15 2006
@@ -72,7 +72,7 @@
# register the format factory
utility(_context=_context, provides=IFactory, component=factory,
- name=u'format-' + name)
+ name=u'cpsskins.format.%s' % name)
# register the predicate
utility(_context=_context, provides=IFormatPredicate,
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
Mon May 1 18:41:15 2006
@@ -61,41 +61,28 @@
# Register the portlet's icon as a resource
icon_name = '%s-%s' % (name, os.path.split(icon)[1])
- resource(_context=_context,
- name=icon_name,
- image=icon)
+ resource(_context=_context, name=icon_name, image=icon)
# Register the zmi icon
- IconDirective(_context=_context,
- name="zmi_icon",
- for_=schema,
- file=icon)
+ IconDirective(_context=_context, name="zmi_icon", for_=schema, file=icon)
# 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,
- permission="zope.ManageContent",
- icon=icon_name,
- )
+ addMenuItem(_context=_context, menu=cpsskins_add_portlet, for_=Interface,
+ title=title, description=description, class_=factory,
+ permission="zope.ManageContent", icon=icon_name)
# zope:content
c = ClassDirective(_context=_context, class_=factory)
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))
+ c.require(_context=_context, permission="zope.View",
+ interface=(schema, IUpdateData))
+ c.require(_context=_context, permission="zope.ManageContent",
+ set_schema=(schema, IUpdateData))
# register the portlet factory
utility(_context=_context, provides=IFactory, component=factory,
- name=u'portlet-' + name)
+ name=u'cpsskins.portlet.%s' % name)
# set up interface types
alsoProvides(schema, IContentType)
Modified:
cpsskins/branches/paris-sprint-2006/configuration/widgets/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/widgets/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/widgets/metaconfigure.py
Mon May 1 18:41:15 2006
@@ -52,7 +52,7 @@
# register widgets
utility(_context=_context, provides=configuration.IWidget,
component=configuration.Widget(name=name, title=title, view=view,
- engine=engine, basic=basic), name=widget_name)
+ engine=engine, basic=basic), name=widget_name)
# zope:adapter
adapter(_context=_context, factory=(view,), provides=IWidgetView,
Modified: cpsskins/branches/paris-sprint-2006/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/configure.zcml Mon May 1 18:41:15 2006
@@ -50,9 +50,9 @@
</class>
<utility
+ name="cpsskins.cache.ImageCache"
component=".caching.ImageCache"
provides="zope.component.interfaces.IFactory"
- name="cpsskins.cache.ImageCache"
/>
<class class=".setup.settings.Settings">
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 Mon May 1
18:41:15 2006
@@ -158,8 +158,8 @@
/>
<utility
- name="theme"
- factory="cpsskins.elements.theme.Theme"
+ name="cpsskins.canvas.theme"
+ component="cpsskins.elements.theme.Theme"
provides="zope.component.interfaces.IFactory"
/>
@@ -197,8 +197,8 @@
/>
<utility
- name="themepage"
- factory="cpsskins.elements.themepage.ThemePage"
+ name="cpsskins.canvas.themepage"
+ component="cpsskins.elements.themepage.ThemePage"
provides="zope.component.interfaces.IFactory"
/>
@@ -266,8 +266,8 @@
/>
<utility
- name="pageblock"
- factory="cpsskins.elements.pageblock.PageBlock"
+ name="cpsskins.canvas.pageblock"
+ component="cpsskins.elements.pageblock.PageBlock"
provides="zope.component.interfaces.IFactory"
/>
@@ -336,8 +336,8 @@
/>
<utility
- name="cell"
- factory="cpsskins.elements.cell.Cell"
+ name="cpsskins.canvas.cell"
+ component="cpsskins.elements.cell.Cell"
provides="zope.component.interfaces.IFactory"
/>
@@ -416,8 +416,8 @@
/>
<utility
- name="slot"
- factory="cpsskins.elements.slot.Slot"
+ name="cpsskins.canvas.slot"
+ component="cpsskins.elements.slot.Slot"
provides="zope.component.interfaces.IFactory"
/>
Modified: cpsskins/branches/paris-sprint-2006/elements/format.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/format.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/format.py Mon May 1
18:41:15 2006
@@ -135,7 +135,7 @@
return names
def addFormat(self, name=u'', types=[]):
- format = createObject(u'format-' + name)
+ format = createObject(u'cpsskins.format.%s' % name)
format.types = types
self.storeFormat(format)
return self.setFormat(format)
Modified: cpsskins/branches/paris-sprint-2006/relations/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/relations/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/relations/configure.zcml Mon May
1 18:41:15 2006
@@ -123,21 +123,21 @@
<!-- Factories -->
<utility
- factory="cpsskins.relations.relations.MonadicRelationFactory"
+ name="cpsskins.relation.monad"
+ component="cpsskins.relations.relations.MonadicRelation"
provides="zope.component.interfaces.IFactory"
- name="monad"
/>
<utility
- factory="cpsskins.relations.relations.DyadicRelationFactory"
+ name="cpsskins.relation.dyad"
+ component="cpsskins.relations.relations.DyadicRelation"
provides="zope.component.interfaces.IFactory"
- name="dyad"
/>
<utility
- factory="cpsskins.relations.relations.TriadicRelationFactory"
+ name="cpsskins.relation.triad"
+ component="cpsskins.relations.relations.TriadicRelation"
provides="zope.component.interfaces.IFactory"
- name="triad"
/>
</configure>
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py Mon May
1 18:41:15 2006
@@ -23,7 +23,7 @@
from zope.app.file import File
from zope.component import getUtilitiesFor, getUtility, getMultiAdapter
from zope.component import queryUtility, getAllUtilitiesRegisteredFor
-from zope.component import createObject
+from zope.component import createObject, providedBy
from cpsskins import minjson as json
from cpsskins import configuration
@@ -100,7 +100,8 @@
exporter = getMultiAdapter((setting, root), IDOMAdapter)
exporter.setDocument(document)
exporter.save()
- return document.toxml()
+
+ return document.toprettyxml(indent=u' ', encoding=u'utf-8')
def reloadSetting(self, name=u''):
"""Reload the setting from the file-system
@@ -189,12 +190,17 @@
if el.nodeType != Node.ELEMENT_NODE:
continue
- relation = createObject(u'relation')
+ contentname = el.tagName
+ factory_name = u'cpsskins.relation.%s' % contentname
+ relation = createObject(factory_name)
+
importer = getMultiAdapter((relation, el), IDOMAdapter)
importer.setDocument(document)
importer.setURIMapping(uri_mapping)
importer.load()
+ relations.add(relation)
+
document.unlink()
### Snapshots ####################################################
@@ -280,9 +286,9 @@
for el in root.childNodes:
if el.nodeType != Node.ELEMENT_NODE:
continue
- content_typename = el.getAttribute('type') or el.tagName
- resource_typename = getTypeName(itemtype)
- factory_name = '%s-%s' % (resource_typename, content_typename)
+ contentname = el.getAttribute('type') or el.tagName
+ resourcename = getTypeName(itemtype)
+ factory_name = u'cpsskins.%s.%s' % (resourcename, contentname)
obj = createObject(factory_name)
importer = getMultiAdapter((obj, el), IDOMAdapter)
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
