[CMF-checkins] SVN: CMF/trunk/ - made Zope >= 2.10.0 required

Yvo Schubbe y.2006_ at wcm-solutions.de
Wed Nov 1 10:42:15 EST 2006


Log message for revision 71020:
  - made Zope >= 2.10.0 required
  - updated code that triggered deprecation warnings

Changed:
  U   CMF/trunk/CHANGES.txt
  U   CMF/trunk/CMFActionIcons/DEPENDENCIES.txt
  U   CMF/trunk/CMFCalendar/DEPENDENCIES.txt
  U   CMF/trunk/CMFCalendar/browser/configure.zcml
  U   CMF/trunk/CMFCore/DEPENDENCIES.txt
  U   CMF/trunk/CMFCore/FSFile.py
  U   CMF/trunk/CMFCore/browser/configure.zcml
  U   CMF/trunk/CMFCore/event.zcml
  U   CMF/trunk/CMFCore/tests/base/testcase.py
  U   CMF/trunk/CMFCore/tests/base/utils.py
  U   CMF/trunk/CMFCore/tests/test_CookieCrumbler.py
  U   CMF/trunk/CMFCore/tests/test_Expression.py
  U   CMF/trunk/CMFCore/tests/test_FSPageTemplate.py
  U   CMF/trunk/CMFCore/tests/test_PortalFolder.py
  U   CMF/trunk/CMFCore/tests/test_TypesTool.py
  U   CMF/trunk/CMFCore/tests/test_fiveactionstool.py
  U   CMF/trunk/CMFDefault/DEPENDENCIES.txt
  U   CMF/trunk/CMFDefault/browser/configure.zcml
  U   CMF/trunk/CMFDefault/interfaces/__init__.py
  U   CMF/trunk/CMFDefault/skin/configure.zcml
  U   CMF/trunk/CMFTopic/DEPENDENCIES.txt
  U   CMF/trunk/CMFUid/DEPENDENCIES.txt
  U   CMF/trunk/DCWorkflow/DEPENDENCIES.txt
  U   CMF/trunk/INSTALL.txt
  U   CMF/trunk/INSTALL_SVN.txt

-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CHANGES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -29,7 +29,11 @@
       'password_email' and 'registered_email' now encode their return value
       correctly, using 'email_charset' and the new 'makeEmail' function.
 
+  Others
 
+    - The CMF now depends on Zope 2.10.0.
+
+
 CMF 2.1.0-alpha (2006/10/09)
 
   New Features

Modified: CMF/trunk/CMFActionIcons/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFActionIcons/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFActionIcons/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,3 +1,3 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 CMFCore
 GenericSetup

Modified: CMF/trunk/CMFCalendar/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFCalendar/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCalendar/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,4 +1,4 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 CMFCore
 CMFDefault
 GenericSetup

Modified: CMF/trunk/CMFCalendar/browser/configure.zcml
===================================================================
--- CMF/trunk/CMFCalendar/browser/configure.zcml	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCalendar/browser/configure.zcml	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,50 +1,49 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:five="http://namespaces.zope.org/five">
+    xmlns:browser="http://namespaces.zope.org/browser">
 
   <browser:page
       for="Products.CMFCalendar.interfaces.IEvent"
+      layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
       name="view.html"
       class=".event.EventView"
       template="templates/event.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
       for="Products.CMFCalendar.interfaces.IMutableEvent"
+      layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
       name="edit.html"
       class=".event.EventEditView"
       template="templates/event_edit.pt"
       permission="cmf.ModifyPortalContent"
-      layer="cmf"
       />
 
   <browser:page
       for="*"
+      layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
       name="calendar_day.html"
       class=".calendar.CalendarView"
       template="templates/calendar_day.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
       for="*"
+      layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
       name="calendar_widget"
       class="Products.CMFDefault.browser.utils.MacroView"
       template="templates/calendar_widgets.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
       for="*"
+      layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
       name="calendar_box_view"
       class=".calendar.CalendarBoxView"
       permission="zope2.View"
-      layer="cmf"
       />
 
 </configure>

Modified: CMF/trunk/CMFCore/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFCore/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,2 +1,2 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 GenericSetup

Modified: CMF/trunk/CMFCore/FSFile.py
===================================================================
--- CMF/trunk/CMFCore/FSFile.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/FSFile.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -21,11 +21,7 @@
 from AccessControl import ClassSecurityInfo
 from OFS.Cache import Cacheable
 from OFS.Image import File
-try:
-    from zope.contenttype import guess_content_type
-except ImportError:
-    # BBB: for Zope 2.9
-    from zope.app.content_types import guess_content_type
+from zope.contenttype import guess_content_type
 
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType

Modified: CMF/trunk/CMFCore/browser/configure.zcml
===================================================================
--- CMF/trunk/CMFCore/browser/configure.zcml	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/browser/configure.zcml	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,17 +1,8 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:five="http://namespaces.zope.org/five"
     i18n_domain="cmf_default">
 
-  <five:traversable class="Products.CMFCore.ActionInformation.ActionCategory"/>
-
-  <five:traversable class="Products.CMFCore.ActionsTool.ActionsTool"/>
-
-  <five:traversable class="Products.CMFCore.TypesTool.TypesTool"/>
-
-  <five:traversable class="Products.CMFCore.WorkflowTool.WorkflowTool"/>
-
   <configure package="Products.GenericSetup.browser">
 
     <browser:page

Modified: CMF/trunk/CMFCore/event.zcml
===================================================================
--- CMF/trunk/CMFCore/event.zcml	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/event.zcml	2006-11-01 15:42:13 UTC (rev 71020)
@@ -3,25 +3,25 @@
 
   <subscriber
       for=".interfaces.ICookieCrumbler
-           zope.app.event.interfaces.IObjectEvent"
+           zope.component.interfaces.IObjectEvent"
       handler=".CookieCrumbler.handleCookieCrumblerEvent"
       />
 
   <subscriber
       for=".interfaces.IContentish
-           zope.app.event.interfaces.IObjectEvent"
+           zope.component.interfaces.IObjectEvent"
       handler=".CMFCatalogAware.handleContentishEvent"
       />
 
   <subscriber
       for=".interfaces.IDynamicType
-           zope.app.event.interfaces.IObjectEvent"
+           zope.component.interfaces.IObjectEvent"
       handler=".CMFCatalogAware.dispatchToOpaqueItems"
       />
 
   <subscriber
       for=".interfaces.ICallableOpaqueItemEvents
-           zope.app.event.interfaces.IObjectEvent"
+           zope.component.interfaces.IObjectEvent"
       handler=".CMFCatalogAware.handleOpaqueItemEvent"
       />
 

Modified: CMF/trunk/CMFCore/tests/base/testcase.py
===================================================================
--- CMF/trunk/CMFCore/tests/base/testcase.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/base/testcase.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -21,29 +21,6 @@
 from security import PermissiveSecurityPolicy
 
 
-_TRAVERSE_ZCML = """
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:five="http://namespaces.zope.org/five"
-    >
-
-  <include package="zope.app.traversing"/>
-
-  <adapter
-      for="*"
-      factory="Products.Five.traversable.FiveTraversable"
-      provides="zope.app.traversing.interfaces.ITraversable"
-      />
-
-  <adapter
-      for="*"
-      factory="zope.app.traversing.adapters.Traverser"
-      provides="zope.app.traversing.interfaces.ITraverser"
-      />
-
-</configure>
-"""
-
 _REQUEST_ZCML = """
 <configure
     xmlns:five="http://namespaces.zope.org/five"
@@ -63,20 +40,13 @@
 
     zcml.load_config('meta.zcml', Products.Five)
     zcml.load_string(_REQUEST_ZCML)
-    try:
-        import zope.traversing
-        zcml.load_config('traversing.zcml', Products.Five)
-    except ImportError:
-        # BBB: for Zope 2.9
-        zcml.load_string(_TRAVERSE_ZCML)
+    zcml.load_config('traversing.zcml', Products.Five)
 
 def setUpEvents():
     import Products
-    import zope.app.event
 
     #   First, set up "stock" OFS event propagation
     zcml.load_config('meta.zcml', Products.Five)
-    zcml.load_config('configure.zcml', zope.app.event)
     zcml.load_config('event.zcml', Products.Five)
     #   Now, register the CMF-specific handler
     zcml.load_config('event.zcml', Products.CMFCore)

Modified: CMF/trunk/CMFCore/tests/base/utils.py
===================================================================
--- CMF/trunk/CMFCore/tests/base/utils.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/base/utils.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -30,11 +30,7 @@
 def _setUpDefaultTraversable():
     from zope.interface import Interface
     from zope.component import provideAdapter
-    try:
-        from zope.traversing.interfaces import ITraversable
-        from zope.traversing.adapters import DefaultTraversable
-    except ImportError: # Zope < 2.10
-        from zope.app.traversing.interfaces import ITraversable
-        from zope.app.traversing.adapters import DefaultTraversable
+    from zope.traversing.interfaces import ITraversable
+    from zope.traversing.adapters import DefaultTraversable
 
     provideAdapter(DefaultTraversable, (Interface,), ITraversable)

Modified: CMF/trunk/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_CookieCrumbler.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/test_CookieCrumbler.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -51,7 +51,7 @@
 
     def setUp(self):
         from zope.component import provideHandler
-        from zope.app.event.interfaces import IObjectEvent
+        from zope.component.interfaces import IObjectEvent
         from Products.CMFCore.interfaces import ICookieCrumbler
         from Products.CMFCore.CookieCrumbler import handleCookieCrumblerEvent
 

Modified: CMF/trunk/CMFCore/tests/test_Expression.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_Expression.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/test_Expression.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -48,34 +48,21 @@
     def test_anonymous_ec(self):
         self.portal.portal_membership = DummyMembershipTool()
         ec = createExprContext(self.folder, self.portal, self.object)
-        if hasattr(ec, 'contexts'):
-            member = ec.contexts['member']
-        else:
-            # BBB: for Zope 2.9
-            member = ec.global_vars['member']
+        member = ec.contexts['member']
         self.failIf(member)
 
     def test_authenticatedUser_ec(self):
         self.portal.portal_membership = DummyMembershipTool(anon=0)
         ec = createExprContext(self.folder, self.portal, self.object)
-        if hasattr(ec, 'contexts'):
-            member = ec.contexts['member']
-        else:
-            # BBB: for Zope 2.9
-            member = ec.global_vars['member']
+        member = ec.contexts['member']
         self.assertEqual(member.getId(), 'dummy')
 
     def test_ec_context(self):
         self.portal.portal_membership = DummyMembershipTool()
         ec = createExprContext(self.folder, self.portal, self.object)
-        if hasattr(ec, 'contexts'):
-            contexts = ec.contexts
-        else:
-            # BBB: for Zope 2.9
-            contexts = ec.global_vars
-        object = contexts['object']
-        portal = contexts['portal']
-        folder = contexts['folder']
+        object = ec.contexts['object']
+        portal = ec.contexts['portal']
+        folder = ec.contexts['folder']
         self.failUnless(object)
         self.assertEqual(object.id, 'bar')
         self.assertEqual(object.absolute_url(), 'url_bar')

Modified: CMF/trunk/CMFCore/tests/test_FSPageTemplate.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_FSPageTemplate.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/test_FSPageTemplate.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -22,8 +22,8 @@
 from os.path import join as path_join
 
 from OFS.Folder import Folder
-from Products.PageTemplates.TALES import Undefined
 from Products.StandardCacheManagers import RAMCacheManager
+from zope.tales.tales import Undefined
 from zope.testing.cleanup import cleanUp
 
 from Products.CMFCore.FSPageTemplate import FSPageTemplate

Modified: CMF/trunk/CMFCore/tests/test_PortalFolder.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_PortalFolder.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/test_PortalFolder.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -69,7 +69,7 @@
         SecurityTest.setUp(self)
         setUpEvents()
         gsm = getGlobalSiteManager()
-        gsm.provideUtility(IFactory, self._getTargetObject(), 'cmf.folder')
+        gsm.registerUtility(self._getTargetObject(), IFactory, 'cmf.folder')
         self.site = DummySite('site').__of__(self.root)
         acl_users = self.site._setObject('acl_users', DummyUserFolder())
         newSecurityManager(None, acl_users.all_powerful_Oz)
@@ -136,7 +136,7 @@
         zcml.load_config('permissions.zcml', Products.Five)
         zcml.load_config('content.zcml', Products.CMFCore)
         gsm = getGlobalSiteManager()
-        gsm.provideUtility(IFactory, PortalFolderFactory, 'cmf.folder')
+        gsm.registerUtility(PortalFolderFactory, IFactory, 'cmf.folder')
         self.site = DummySite('site').__of__(self.root)
 
     def tearDown(self):

Modified: CMF/trunk/CMFCore/tests/test_TypesTool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_TypesTool.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/test_TypesTool.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -454,7 +454,7 @@
     def setUp(self):
         SecurityTest.setUp(self)
         gsm = getGlobalSiteManager()
-        gsm.provideUtility(IFactory, DummyFactory, 'test.dummy')
+        gsm.registerUtility(DummyFactory, IFactory, 'test.dummy')
 
         self.f = DummyFolder()
         self.ti = self._makeOne('Foo', meta_type='Dummy',

Modified: CMF/trunk/CMFCore/tests/test_fiveactionstool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_fiveactionstool.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFCore/tests/test_fiveactionstool.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -35,7 +35,7 @@
 
     For menus to work, the request must have defaultSkin.
     
-      >>> from zope.app.publication.browser import setDefaultSkin
+      >>> from zope.publisher.browser import setDefaultSkin
       >>> setDefaultSkin(self.folder.REQUEST)
       
     We need to make Zope 3 use Zope 2s security policy

Modified: CMF/trunk/CMFDefault/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFDefault/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFDefault/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,3 +1,3 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 CMFCore
 GenericSetup

Modified: CMF/trunk/CMFDefault/browser/configure.zcml
===================================================================
--- CMF/trunk/CMFDefault/browser/configure.zcml	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFDefault/browser/configure.zcml	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,105 +1,102 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:five="http://namespaces.zope.org/five">
+    xmlns:browser="http://namespaces.zope.org/browser">
 
-  <five:traversable class="Products.CMFCore.DynamicType.DynamicType"/>
-
   <browser:page
       for="Products.CMFCore.interfaces.IFolderish"
+      layer="..interfaces.ICMFDefaultSkin"
       name="view.html"
       class=".folder.FolderView"
       template="templates/folder.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
       for="Products.CMFCore.interfaces.IFolderish"
+      layer="..interfaces.ICMFDefaultSkin"
       name="edit.html"
       class=".folder.FolderContentsView"
       template="templates/folder_contents.pt"
       permission="cmf.ListFolderContents"
-      layer="cmf"
       />
 
   <browser:page
       for="Products.CMFCore.interfaces.IMutableMinimalDublinCore"
+      layer="..interfaces.ICMFDefaultSkin"
       name="properties.html"
       class=".metadata.MetadataMinimalEditView"
       template="templates/metadata_minimal_edit.pt"
       permission="zope2.ManageProperties"
-      layer="cmf"
       />
 
   <browser:page
       for="Products.CMFCore.interfaces.IMutableDublinCore"
+      layer="..interfaces.ICMFDefaultSkin"
       name="properties.html"
       class=".metadata.MetadataEditView"
       template="templates/metadata_edit.pt"
       permission="cmf.ModifyPortalContent"
-      layer="cmf"
       />
 
   <browser:page
-      for="Products.CMFDefault.interfaces.IDocument"
+      for="..interfaces.IDocument"
+      layer="..interfaces.ICMFDefaultSkin"
       name="view.html"
       class=".document.DocumentView"
       template="templates/document.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
-      for="Products.CMFDefault.interfaces.IMutableDocument"
+      for="..interfaces.IMutableDocument"
+      layer="..interfaces.ICMFDefaultSkin"
       name="edit.html"
       class=".document.DocumentEditView"
       template="templates/document_edit.pt"
       permission="cmf.ModifyPortalContent"
-      layer="cmf"
       />
 
   <browser:page
-      for="Products.CMFDefault.interfaces.IMutableNewsItem"
+      for="..interfaces.IMutableNewsItem"
+      layer="..interfaces.ICMFDefaultSkin"
       name="edit.html"
       class=".newsitem.NewsItemEditView"
       template="templates/newsitem_edit.pt"
       permission="cmf.ModifyPortalContent"
-      layer="cmf"
       />
 
   <browser:page
-      for="Products.CMFDefault.interfaces.ILink"
+      for="..interfaces.ILink"
+      layer="..interfaces.ICMFDefaultSkin"
       name="view.html"
       class=".link.LinkView"
       template="templates/link.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
-      for="Products.CMFDefault.interfaces.IMutableLink"
+      for="..interfaces.IMutableLink"
+      layer="..interfaces.ICMFDefaultSkin"
       name="edit.html"
       class=".link.LinkEditView"
       template="templates/link_edit.pt"
       permission="cmf.ModifyPortalContent"
-      layer="cmf"
       />
 
   <browser:page
       for="*"
+      layer="..interfaces.ICMFDefaultSkin"
       name="form_widget"
       template="templates/form_widgets.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
   <browser:page
       for="*"
+      layer="..interfaces.ICMFDefaultSkin"
       name="batch_widget"
       template="templates/batch_widgets.pt"
       permission="zope2.View"
-      layer="cmf"
       />
 
 </configure>

Modified: CMF/trunk/CMFDefault/interfaces/__init__.py
===================================================================
--- CMF/trunk/CMFDefault/interfaces/__init__.py	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFDefault/interfaces/__init__.py	2006-11-01 15:42:13 UTC (rev 71020)
@@ -15,9 +15,17 @@
 $Id$
 """
 
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from _content import *
 from _tools import *
 
+
+class ICMFDefaultSkin(IDefaultBrowserLayer):
+
+    """CMF default skin.
+    """
+
+
 # BBB: will be removed in CMF 2.2
 #      create zope2 interfaces
 from Interface.bridge import createZope3Bridge

Modified: CMF/trunk/CMFDefault/skin/configure.zcml
===================================================================
--- CMF/trunk/CMFDefault/skin/configure.zcml	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFDefault/skin/configure.zcml	2006-11-01 15:42:13 UTC (rev 71020)
@@ -3,15 +3,12 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="cmf_default">
 
-  <browser:layer
+  <interface
+      interface="..interfaces.ICMFDefaultSkin"
+      type="zope.publisher.interfaces.browser.IBrowserSkinType"
       name="cmf"
       />
 
-  <browser:skin
-      name="cmf"
-      layers="cmf default"
-      />
-
   <browser:defaultSkin
       name="cmf"
       />
@@ -19,10 +16,10 @@
   <!-- Define a default template with css-oriented slots -->
   <browser:page
       for="Products.CMFCore.interfaces.IDynamicType"
+      layer="..interfaces.ICMFDefaultSkin"
       template="five_template.pt"
       name="five_template"
       permission="zope.Public"
-      layer="cmf"
       />
 
 </configure>

Modified: CMF/trunk/CMFTopic/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFTopic/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFTopic/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,4 +1,4 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 CMFCore
 CMFDefault
 GenericSetup

Modified: CMF/trunk/CMFUid/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFUid/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/CMFUid/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,3 +1,3 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 CMFCore
 GenericSetup

Modified: CMF/trunk/DCWorkflow/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/DCWorkflow/DEPENDENCIES.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/DCWorkflow/DEPENDENCIES.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -1,3 +1,3 @@
-Zope >= 2.9.0
+Zope >= 2.10.0
 CMFCore
 GenericSetup

Modified: CMF/trunk/INSTALL.txt
===================================================================
--- CMF/trunk/INSTALL.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/INSTALL.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -2,14 +2,14 @@
 
   Requirements
 
-    - Zope v. 2.9.0 or later
+    - Zope v. 2.10.0 or later
 
   Assumptions
 
     - New installation
 
     - Zope configured using INSTANCE_HOME, /var/zope, and
-      SOFTWARE_HOME, /usr/local/zope/Zope-2.9.0
+      SOFTWARE_HOME, /usr/local/zope/Zope-2.10.0
 
   Procedure
 

Modified: CMF/trunk/INSTALL_SVN.txt
===================================================================
--- CMF/trunk/INSTALL_SVN.txt	2006-11-01 14:48:03 UTC (rev 71019)
+++ CMF/trunk/INSTALL_SVN.txt	2006-11-01 15:42:13 UTC (rev 71020)
@@ -12,7 +12,7 @@
       the sources for a specific version from Subversion.
 
   * Please note that the trunk version of the CMF requires Zope 
-    2.9.0 or later.
+    2.10.0 or later.
 
   * For help with Subversion in general, see "Version Control with 
     Subversion" at http://svnbook.red-bean.com/



More information about the CMF-checkins mailing list