[CMF-checkins] SVN: CMF/branches/1.6/ backported r40386:40387 from
trunk:
Yvo Schubbe
y.2005- at wcm-solutions.de
Mon Nov 28 11:21:21 EST 2005
Log message for revision 40391:
backported r40386:40387 from trunk:
- converted skins tool setup handlers to new style and moved them to CMFCore
- moved user folder setup to toolset.xml
- updated profiles
others:
- synced profiles with trunk where it makes sense
Changed:
U CMF/branches/1.6/CMFActionIcons/DEPENDENCIES.txt
U CMF/branches/1.6/CMFActionIcons/__init__.py
U CMF/branches/1.6/CMFActionIcons/profiles/actionicons/skins.xml
U CMF/branches/1.6/CMFCalendar/DEPENDENCIES.txt
U CMF/branches/1.6/CMFCalendar/__init__.py
A CMF/branches/1.6/CMFCalendar/profiles/default/catalog.xml
U CMF/branches/1.6/CMFCalendar/profiles/default/skins.xml
U CMF/branches/1.6/CMFCalendar/profiles/default/types/Event.xml
U CMF/branches/1.6/CMFCalendar/profiles/default/typestool.xml
U CMF/branches/1.6/CMFCalendar/setuphandlers.py
U CMF/branches/1.6/CMFCore/DirectoryView.py
U CMF/branches/1.6/CMFCore/__init__.py
U CMF/branches/1.6/CMFCore/exportimport/configure.zcml
A CMF/branches/1.6/CMFCore/exportimport/skins.py
A CMF/branches/1.6/CMFCore/exportimport/tests/four/
A CMF/branches/1.6/CMFCore/exportimport/tests/one/
A CMF/branches/1.6/CMFCore/exportimport/tests/test_skins.py
U CMF/branches/1.6/CMFCore/exportimport/tests/test_workflow.py
A CMF/branches/1.6/CMFCore/exportimport/tests/three/
A CMF/branches/1.6/CMFCore/exportimport/tests/two/
U CMF/branches/1.6/CMFCore/interfaces/_tools.py
U CMF/branches/1.6/CMFDefault/profiles/default/export_steps.xml
U CMF/branches/1.6/CMFDefault/profiles/default/import_steps.xml
A CMF/branches/1.6/CMFDefault/profiles/default/skins/
U CMF/branches/1.6/CMFDefault/profiles/default/skins.xml
U CMF/branches/1.6/CMFDefault/profiles/default/toolset.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/Discussion_Item.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/Document.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/Favorite.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/File.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/Folder.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/Image.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/Link.xml
U CMF/branches/1.6/CMFDefault/profiles/default/types/News_Item.xml
U CMF/branches/1.6/CMFDefault/setuphandlers.py
U CMF/branches/1.6/CMFTopic/profiles/default/skins.xml
U CMF/branches/1.6/CMFTopic/profiles/default/types/Topic.xml
U CMF/branches/1.6/DCWorkflow/tests/test_exportimport.py
-=-
Modified: CMF/branches/1.6/CMFActionIcons/DEPENDENCIES.txt
===================================================================
--- CMF/branches/1.6/CMFActionIcons/DEPENDENCIES.txt 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFActionIcons/DEPENDENCIES.txt 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,2 +1,4 @@
-Zope >= 2.7.0
+Zope >= 2.8.5
+Five >= 1.2
CMFCore
+GenericSetup
Modified: CMF/branches/1.6/CMFActionIcons/__init__.py
===================================================================
--- CMF/branches/1.6/CMFActionIcons/__init__.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFActionIcons/__init__.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -21,6 +21,7 @@
try:
from Products.CMFSetup import EXTENSION
from Products.CMFSetup import profile_registry
+ from Products.CMFCore.interfaces import ISiteRoot
has_profile_registry = True
except ImportError:
has_profile_registry = False
@@ -44,4 +45,6 @@
'Adds action icon tool / settings.',
'profiles/actionicons',
'CMFActionIcons',
- EXTENSION)
+ EXTENSION,
+ for_=ISiteRoot,
+ )
Modified: CMF/branches/1.6/CMFActionIcons/profiles/actionicons/skins.xml
===================================================================
--- CMF/branches/1.6/CMFActionIcons/profiles/actionicons/skins.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFActionIcons/profiles/actionicons/skins.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<skins-tool>
- <skin-directory id="actionicons"
- directory="CMFActionIcons/skins/actionicons"/>
- <skin-path id="*">
+<object name="portal_skins" meta_type="CMF Skins Tool">
+ <object name="actionicons" meta_type="Filesystem Directory View"
+ directory="CMFActionIcons/skins/actionicons"/>
+ <skin-path name="*">
<layer name="actionicons" insert-before="zpt_content"/>
</skin-path>
-</skins-tool>
+</object>
Modified: CMF/branches/1.6/CMFCalendar/DEPENDENCIES.txt
===================================================================
--- CMF/branches/1.6/CMFCalendar/DEPENDENCIES.txt 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCalendar/DEPENDENCIES.txt 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,3 +1,5 @@
-Zope >= 2.7.0
+Zope >= 2.8.5
+Five >= 1.2
CMFCore
CMFDefault
+GenericSetup
Modified: CMF/branches/1.6/CMFCalendar/__init__.py
===================================================================
--- CMF/branches/1.6/CMFCalendar/__init__.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCalendar/__init__.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -18,13 +18,10 @@
import sys
from Products.CMFCore import utils
+from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.DirectoryView import registerDirectory
-try:
- from Products.CMFSetup import EXTENSION
- from Products.CMFSetup import profile_registry
- has_profile_registry = True
-except ImportError:
- has_profile_registry = False
+from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import profile_registry
import Event
import CalendarTool
@@ -61,10 +58,11 @@
, fti = Event.factory_type_information
).initialize( context )
- if has_profile_registry:
- profile_registry.registerProfile('default',
- 'CMFCalendar',
- 'Adds calendar support.',
- 'profiles/default',
- 'CMFCalendar',
- EXTENSION)
+ profile_registry.registerProfile('default',
+ 'CMFCalendar',
+ 'Adds calendar support.',
+ 'profiles/default',
+ 'CMFCalendar',
+ EXTENSION,
+ for_=ISiteRoot,
+ )
Copied: CMF/branches/1.6/CMFCalendar/profiles/default/catalog.xml (from rev 40387, CMF/trunk/CMFCalendar/profiles/default/catalog.xml)
Modified: CMF/branches/1.6/CMFCalendar/profiles/default/skins.xml
===================================================================
--- CMF/branches/1.6/CMFCalendar/profiles/default/skins.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCalendar/profiles/default/skins.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<skins-tool>
- <skin-directory id="zpt_calendar"
- directory="CMFCalendar/skins/zpt_calendar"/>
- <skin-path id="*">
+<object name="portal_skins" meta_type="CMF Skins Tool">
+ <object name="zpt_calendar" meta_type="Filesystem Directory View"
+ directory="CMFCalendar/skins/zpt_calendar"/>
+ <skin-path name="*">
<layer name="zpt_calendar" insert-before="zpt_content"/>
</skin-path>
-</skins-tool>
+</object>
Modified: CMF/branches/1.6/CMFCalendar/profiles/default/types/Event.xml
===================================================================
--- CMF/branches/1.6/CMFCalendar/profiles/default/types/Event.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCalendar/profiles/default/types/Event.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,28 +1,26 @@
<?xml version="1.0"?>
-<type-info id="Event" kind="Factory-based Type Information">
- <property name="title">Event</property>
- <property name="description">Events are objects for use in Calendar topical queries on the catalog.</property>
- <property name="content_icon">event_icon.gif</property>
- <property name="content_meta_type">CMF Event</property>
- <property name="product">CMFCalendar</property>
- <property name="factory">addEvent</property>
- <property name="immediate_view">event_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"></property>
- <property name="allow_discussion">False</property>
- <aliases>
- <alias from="(Default)" to="event_view"/>
- <alias from="view" to="event_view"/>
- </aliases>
- <action action_id="view" title="View" condition_expr=""
- url_expr="string:${object_url}/event_view"
- category="object" visible="True">
- <permission>View</permission>
- </action>
- <action action_id="edit" title="Edit" condition_expr=""
- url_expr="string:${object_url}/event_edit_form"
- category="object" visible="True">
- <permission>Change portal events</permission>
- </action>
-</type-info>
+<object name="Event" meta_type="Factory-based Type Information"
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Event</property>
+ <property
+ name="description">Events are objects for use in Calendar topical queries on the catalog.</property>
+ <property name="content_icon">event_icon.gif</property>
+ <property name="content_meta_type">CMF Event</property>
+ <property name="product">CMFCalendar</property>
+ <property name="factory">addEvent</property>
+ <property name="immediate_view">event_edit_form</property>
+ <property name="global_allow">True</property>
+ <property name="filter_content_types">True</property>
+ <property name="allowed_content_types"/>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="event_view"/>
+ <alias from="view" to="event_view"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+ url_expr="string:${object_url}/event_view" visible="True">
+ <permission value="View"/>
+ </action>
+ <action title="Edit" action_id="edit" category="object" condition_expr=""
+ url_expr="string:${object_url}/event_edit_form" visible="True">
+ <permission value="Change portal events"/>
+ </action>
+</object>
Modified: CMF/branches/1.6/CMFCalendar/profiles/default/typestool.xml
===================================================================
--- CMF/branches/1.6/CMFCalendar/profiles/default/typestool.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCalendar/profiles/default/typestool.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
-<types-tool>
- <type id="Event"/>
-</types-tool>
+<object name="portal_types" meta_type="CMF Types Tool">
+ <object name="Event" meta_type="Factory-based Type Information"/>
+</object>
Modified: CMF/branches/1.6/CMFCalendar/setuphandlers.py
===================================================================
--- CMF/branches/1.6/CMFCalendar/setuphandlers.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCalendar/setuphandlers.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -17,7 +17,6 @@
from Products.CMFCore.utils import getToolByName
-from exceptions import CatalogError
from exceptions import MetadataError
@@ -28,27 +27,8 @@
are implemented for these steps.
"""
site = context.getSite()
- ctool = getToolByName(site, 'portal_catalog')
mdtool = getToolByName(site, 'portal_metadata')
- # Set up a catalog indexes and metadata
- try:
- ctool.addIndex('start', 'DateIndex')
- except CatalogError:
- pass
- try:
- ctool.addIndex('end', 'DateIndex')
- except CatalogError:
- pass
- try:
- ctool.addColumn('start')
- except CatalogError:
- pass
- try:
- ctool.addColumn('end')
- except CatalogError:
- pass
-
# Set up a MetadataTool element policy for events
try:
mdtool.addElementPolicy(
Modified: CMF/branches/1.6/CMFCore/DirectoryView.py
===================================================================
--- CMF/branches/1.6/CMFCore/DirectoryView.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCore/DirectoryView.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -32,9 +32,11 @@
from OFS.Folder import Folder
from OFS.ObjectManager import bad_id
from zLOG import LOG, ERROR
+from zope.interface import implements
from FSMetadata import FSMetadata
from FSObject import BadFile
+from interfaces import IDirectoryView
from permissions import AccessContentsInformation
from permissions import ManagePortal
from utils import _dtmldir
@@ -394,11 +396,14 @@
class DirectoryView (Persistent):
""" Directory views mount filesystem directories.
"""
+
+ implements(IDirectoryView)
+
meta_type = 'Filesystem Directory View'
_dirpath = None
_objects = ()
- def __init__(self, id, dirpath, fullname=None):
+ def __init__(self, id, dirpath='', fullname=None):
self.id = id
self._dirpath = dirpath
@@ -418,7 +423,7 @@
if info is not None:
# update the directory view with a corrected path
self._dirpath = dirpath
- else:
+ elif self._dirpath:
warn('DirectoryView %s refers to a non-existing path %s'
% (self.id, dirpath), UserWarning)
if info is None:
@@ -440,6 +445,8 @@
""" Folderish DirectoryView.
"""
+ implements(IDirectoryView)
+
meta_type = 'Filesystem Directory View'
all_meta_types = ()
_isDirectoryView = 1
Modified: CMF/branches/1.6/CMFCore/__init__.py
===================================================================
--- CMF/branches/1.6/CMFCore/__init__.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCore/__init__.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -100,7 +100,7 @@
utils.initializeBasesPhase2(z_tool_bases, context)
context.registerClass(
- DirectoryView.DirectoryViewSurrogate,
+ DirectoryView.DirectoryView,
constructors=(('manage_addDirectoryViewForm',
DirectoryView.manage_addDirectoryViewForm),
DirectoryView.manage_addDirectoryView,
Modified: CMF/branches/1.6/CMFCore/exportimport/configure.zcml
===================================================================
--- CMF/branches/1.6/CMFCore/exportimport/configure.zcml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCore/exportimport/configure.zcml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -82,6 +82,25 @@
/>
<adapter
+ factory=".skins.DirectoryViewNodeAdapter"
+ provides="Products.GenericSetup.interfaces.INodeExporter"
+ for="Products.CMFCore.interfaces.IDirectoryView"
+ />
+
+ <adapter
+ factory=".skins.DirectoryViewNodeAdapter"
+ provides="Products.GenericSetup.interfaces.INodeImporter"
+ for="Products.CMFCore.interfaces.IDirectoryView"
+ />
+
+ <adapter
+ factory=".skins.SkinsToolXMLAdapter"
+ provides="Products.GenericSetup.interfaces.IBody"
+ for="Products.CMFCore.interfaces.ISkinsTool
+ Products.GenericSetup.interfaces.ISetupContext"
+ />
+
+ <adapter
factory=".typeinfo.TypeInformationXMLAdapter"
provides="Products.GenericSetup.interfaces.IBody"
for="Products.CMFCore.interfaces.ITypeInformation
Copied: CMF/branches/1.6/CMFCore/exportimport/skins.py (from rev 40388, CMF/trunk/CMFCore/exportimport/skins.py)
Copied: CMF/branches/1.6/CMFCore/exportimport/tests/four (from rev 40388, CMF/trunk/CMFCore/exportimport/tests/four)
Copied: CMF/branches/1.6/CMFCore/exportimport/tests/one (from rev 40388, CMF/trunk/CMFCore/exportimport/tests/one)
Copied: CMF/branches/1.6/CMFCore/exportimport/tests/test_skins.py (from rev 40388, CMF/trunk/CMFCore/exportimport/tests/test_skins.py)
Modified: CMF/branches/1.6/CMFCore/exportimport/tests/test_workflow.py
===================================================================
--- CMF/branches/1.6/CMFCore/exportimport/tests/test_workflow.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCore/exportimport/tests/test_workflow.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -31,8 +31,8 @@
from Products.GenericSetup.tests.common import BaseRegistryTests
from Products.GenericSetup.tests.common import DummyExportContext
from Products.GenericSetup.tests.common import DummyImportContext
+from Products.GenericSetup.utils import BodyAdapterBase
-
_DUMMY_ZCML = """\
<configure
xmlns="http://namespaces.zope.org/zope"
@@ -46,6 +46,12 @@
addview="addDummyWorkflow.html"
global="false"
/>
+ <adapter
+ factory="Products.CMFCore.exportimport.tests.test_workflow.DummyWorkflowBodyAdapter"
+ provides="Products.GenericSetup.interfaces.IBody"
+ for="Products.CMFCore.interfaces.IWorkflowDefinition
+ Products.GenericSetup.interfaces.ISetupContext"
+ />
</configure>
"""
@@ -176,6 +182,11 @@
return self._id
+class DummyWorkflowBodyAdapter(BodyAdapterBase):
+
+ pass
+
+
class WorkflowToolXMLAdapterTests(BodyAdapterTestCase):
def _getTargetClass(self):
@@ -214,6 +225,7 @@
BaseRegistryTests.setUp(self)
zcml.load_config('meta.zcml', Products.Five)
zcml.load_config('configure.zcml', Products.CMFCore.exportimport)
+ zcml.load_string(_DUMMY_ZCML)
def tearDown(self):
BaseRegistryTests.tearDown(self)
@@ -242,7 +254,6 @@
WF_TITLE_NON = 'Non-DCWorkflow'
site = self._initSite()
-
wf_tool = site.portal_workflow
nondcworkflow = DummyWorkflow(WF_TITLE_NON)
nondcworkflow.title = WF_TITLE_NON
@@ -251,8 +262,7 @@
context = DummyExportContext(site)
exportWorkflowTool(context)
- self.assertEqual(len(context._wrote), 1)
-
+ self.assertEqual(len(context._wrote), 2)
filename, text, content_type = context._wrote[0]
self.assertEqual(filename, 'workflows.xml')
self._compareDOM(text, _NORMAL_TOOL_EXPORT)
Copied: CMF/branches/1.6/CMFCore/exportimport/tests/three (from rev 40388, CMF/trunk/CMFCore/exportimport/tests/three)
Copied: CMF/branches/1.6/CMFCore/exportimport/tests/two (from rev 40388, CMF/trunk/CMFCore/exportimport/tests/two)
Modified: CMF/branches/1.6/CMFCore/interfaces/_tools.py
===================================================================
--- CMF/branches/1.6/CMFCore/interfaces/_tools.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFCore/interfaces/_tools.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1133,6 +1133,12 @@
#
# Skins tool interfaces
#
+class IDirectoryView(Interface):
+
+ """ Directory views mount filesystem directories.
+ """
+
+
class ISkinsContainer(Interface):
""" An object that provides skins.
Modified: CMF/branches/1.6/CMFDefault/profiles/default/export_steps.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/export_steps.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/export_steps.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -41,7 +41,7 @@
Export custom roles and non-default role-permission mappings.
</export-step>
<export-step id="skins"
- handler="Products.CMFSetup.skins.exportSkinsTool"
+ handler="Products.CMFCore.exportimport.skins.exportSkinsTool"
title="Skins Tool">
Export skins tool's filesystem directory views and skin path definitions.
</export-step>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/import_steps.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/import_steps.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/import_steps.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -49,7 +49,7 @@
Import custom roles and non-default role-permission mappings.
</import-step>
<import-step id="skins" version="20040630-01"
- handler="Products.CMFSetup.skins.importSkinsTool"
+ handler="Products.CMFCore.exportimport.skins.importSkinsTool"
title="Skins Tool">
<dependency step="toolset"/>
Import skins tool's filesystem directory views and skin path definitions.
Copied: CMF/branches/1.6/CMFDefault/profiles/default/skins (from rev 40388, CMF/trunk/CMFDefault/profiles/default/skins)
Modified: CMF/branches/1.6/CMFDefault/profiles/default/skins.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/skins.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/skins.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,20 +1,21 @@
<?xml version="1.0"?>
-<skins-tool default_skin="Basic"
- request_varname="portal_skin" allow_any="0"
- cookie_persistence="0">
- <skin-directory id="Images"
- directory="CMFDefault/skins/Images"/>
- <skin-directory id="zpt_content"
- directory="CMFDefault/skins/zpt_content"/>
- <skin-directory id="zpt_control"
- directory="CMFDefault/skins/zpt_control"/>
- <skin-directory id="zpt_generic"
- directory="CMFDefault/skins/zpt_generic"/>
- <skin-path id="Basic">
+<object name="portal_skins" meta_type="CMF Skins Tool" allow_any="False"
+ cookie_persistence="False" default_skin="Basic"
+ request_varname="portal_skin">
+ <object name="Images" meta_type="Filesystem Directory View"
+ directory="CMFDefault/skins/Images"/>
+ <object name="custom" meta_type="Folder"/>
+ <object name="zpt_content" meta_type="Filesystem Directory View"
+ directory="CMFDefault/skins/zpt_content"/>
+ <object name="zpt_control" meta_type="Filesystem Directory View"
+ directory="CMFDefault/skins/zpt_control"/>
+ <object name="zpt_generic" meta_type="Filesystem Directory View"
+ directory="CMFDefault/skins/zpt_generic"/>
+ <skin-path name="Basic">
<layer name="custom"/>
<layer name="zpt_content"/>
<layer name="zpt_generic"/>
<layer name="zpt_control"/>
<layer name="Images"/>
</skin-path>
-</skins-tool>
+</object>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/toolset.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/toolset.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/toolset.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -3,6 +3,8 @@
<required tool_id="MailHost"
class="Products.MailHost.MailHost.MailHost"/>
+ <required tool_id="acl_users"
+ class="AccessControl.User.UserFolder"/>
<required tool_id="caching_policy_manager"
class="Products.CMFCore.CachingPolicyManager.CachingPolicyManager"/>
<required tool_id="content_type_registry"
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="CMF BTree Folder" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">CMF BTree Folder</property>
- <property name="description"
- i18n:translate="">Folder for holding very large numbers of items.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">CMF BTree Folder</property>
+ <property
+ name="description">Folder for holding very large numbers of items.</property>
<property name="content_icon">folder_icon.gif</property>
<property name="content_meta_type">CMF BTree Folder</property>
<property name="product">CMFCore</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/Discussion_Item.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/Discussion_Item.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/Discussion_Item.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Discussion Item" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Discussion Item</property>
- <property name="description"
- i18n:translate="">Discussion Items are documents which reply to other content.
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Discussion Item</property>
+ <property
+ name="description">Discussion Items are documents which reply to other content.
They should *not* be addable through the standard 'folder_factories' interface.</property>
<property name="content_icon">discussionitem_icon.gif</property>
<property name="content_meta_type">Discussion Item</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/Document.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/Document.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/Document.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Document" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Document</property>
- <property name="description"
- i18n:translate="">Documents contain text that can be formatted using 'Structured Text.'
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Document</property>
+ <property
+ name="description">Documents contain text that can be formatted using 'Structured Text.'
They may also contain HTML, or "plain" text.</property>
<property name="content_icon">document_icon.gif</property>
<property name="content_meta_type">Document</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/Favorite.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/Favorite.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/Favorite.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Favorite" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Favorite</property>
- <property name="description"
- i18n:translate="">A Favorite is a Link to an intra-portal resource.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Favorite</property>
+ <property
+ name="description">A Favorite is a Link to an intra-portal resource.</property>
<property name="content_icon">link_icon.gif</property>
<property name="content_meta_type">Favorite</property>
<property name="product">CMFDefault</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/File.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/File.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/File.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="File" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">File</property>
- <property name="description"
- i18n:translate="">File objects can contain arbitrary downloadable files.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">File</property>
+ <property
+ name="description">File objects can contain arbitrary downloadable files.</property>
<property name="content_icon">file_icon.gif</property>
<property name="content_meta_type">Portal File</property>
<property name="product">CMFDefault</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/Folder.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/Folder.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/Folder.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Folder" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Folder</property>
- <property name="description"
- i18n:translate="">Use folders to put content in categories.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Folder</property>
+ <property
+ name="description">Use folders to put content in categories.</property>
<property name="content_icon">folder_icon.gif</property>
<property name="content_meta_type">Portal Folder</property>
<property name="product">CMFCore</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/Image.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/Image.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/Image.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Image" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Image</property>
- <property name="description"
- i18n:translate="">Image objects can be embedded in Portal documents.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Image</property>
+ <property
+ name="description">Image objects can be embedded in Portal documents.</property>
<property name="content_icon">image_icon.gif</property>
<property name="content_meta_type">Portal Image</property>
<property name="product">CMFDefault</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/Link.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/Link.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/Link.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
<object name="Link" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Link</property>
- <property name="description"
- i18n:translate="">Link items are annotated URLs.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Link</property>
+ <property name="description">Link items are annotated URLs.</property>
<property name="content_icon">link_icon.gif</property>
<property name="content_meta_type">Link</property>
<property name="product">CMFDefault</property>
Modified: CMF/branches/1.6/CMFDefault/profiles/default/types/News_Item.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/default/types/News_Item.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/profiles/default/types/News_Item.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="News Item" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">News Item</property>
- <property name="description"
- i18n:translate="">News Items contain short text articles and carry a title as well as
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">News Item</property>
+ <property
+ name="description">News Items contain short text articles and carry a title as well as
an optional description.</property>
<property name="content_icon">newsitem_icon.gif</property>
<property name="content_meta_type">News Item</property>
Modified: CMF/branches/1.6/CMFDefault/setuphandlers.py
===================================================================
--- CMF/branches/1.6/CMFDefault/setuphandlers.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFDefault/setuphandlers.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -15,8 +15,6 @@
$Id$
"""
-from Products.CMFCore.utils import getToolByName
-
from exceptions import BadRequest
@@ -28,15 +26,10 @@
"""
site = context.getSite()
- # add custom skin folder
- stool = getToolByName(site, 'portal_skins')
try:
- stool.manage_addProduct['OFSP'].manage_addFolder(id='custom')
+ site.manage_addPortalFolder('Members')
except BadRequest:
return 'Various settings: Nothing to import.'
-
- site.manage_addProduct['OFSP'].manage_addUserFolder()
- site.manage_addPortalFolder('Members')
site.Members.manage_addProduct['OFSP'].manage_addDTMLMethod('index_html',
'Member list', '<dtml-return roster>')
Modified: CMF/branches/1.6/CMFTopic/profiles/default/skins.xml
===================================================================
--- CMF/branches/1.6/CMFTopic/profiles/default/skins.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFTopic/profiles/default/skins.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<skins-tool>
- <skin-directory id="zpt_topic"
- directory="CMFTopic/skins/zpt_topic"/>
- <skin-path id="*">
+<object name="portal_skins" meta_type="CMF Skins Tool">
+ <object name="zpt_topic" meta_type="Filesystem Directory View"
+ directory="CMFTopic/skins/zpt_topic"/>
+ <skin-path name="*">
<layer name="zpt_topic" insert-before="zpt_content"/>
</skin-path>
-</skins-tool>
+</object>
Modified: CMF/branches/1.6/CMFTopic/profiles/default/types/Topic.xml
===================================================================
--- CMF/branches/1.6/CMFTopic/profiles/default/types/Topic.xml 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/CMFTopic/profiles/default/types/Topic.xml 2005-11-28 16:21:21 UTC (rev 40391)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Topic" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Topic</property>
- <property name="description"
- i18n:translate="">Topics are canned queries for organizing content with up to date queries into the catalog.</property>
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Topic</property>
+ <property
+ name="description">Topics are canned queries for organizing content with up to date queries into the catalog.</property>
<property name="content_icon">topic_icon.gif</property>
<property name="content_meta_type">Portal Topic</property>
<property name="product">CMFTopic</property>
Modified: CMF/branches/1.6/DCWorkflow/tests/test_exportimport.py
===================================================================
--- CMF/branches/1.6/DCWorkflow/tests/test_exportimport.py 2005-11-28 15:35:28 UTC (rev 40390)
+++ CMF/branches/1.6/DCWorkflow/tests/test_exportimport.py 2005-11-28 16:21:21 UTC (rev 40391)
@@ -81,7 +81,6 @@
zcml.load_config('permissions.zcml', Products.Five)
zcml.load_config('configure.zcml', Products.DCWorkflow)
zcml.load_config('configure.zcml', Products.GenericSetup.PythonScripts)
- zcml.load_string(_DUMMY_ZCML)
def _initDCWorkflow( self, workflow_id ):
@@ -1798,14 +1797,14 @@
exportWorkflowTool( context )
# workflows list, wf defintion and 3 scripts
- self.assertEqual( len( context._wrote ), 5 )
+ self.assertEqual( len( context._wrote ), 6 )
filename, text, content_type = context._wrote[ 0 ]
self.assertEqual( filename, 'workflows.xml' )
self._compareDOM( text, _NORMAL_TOOL_EXPORT )
self.assertEqual( content_type, 'text/xml' )
- filename, text, content_type = context._wrote[ 1 ]
+ filename, text, content_type = context._wrote[ 2 ]
self.assertEqual( filename, 'workflows/%s/definition.xml' % WF_ID_DC )
self._compareDOM( text
, _NORMAL_WORKFLOW_EXPORT
@@ -1817,7 +1816,7 @@
self.assertEqual( content_type, 'text/xml' )
# just testing first script
- filename, text, content_type = context._wrote[ 2 ]
+ filename, text, content_type = context._wrote[ 3 ]
self.assertEqual( filename, 'workflows/%s/scripts/after_close.py' % WF_ID_DC )
self.assertEqual( text, _AFTER_CLOSE_SCRIPT)
self.assertEqual( content_type, 'text/plain' )
More information about the CMF-checkins
mailing list