[CMF-checkins] CVS: CMF/CMFCore - ActionProviderBase.py:1.14 __init__.py:1.21

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv6885/CMFCore

Modified Files:
	ActionProviderBase.py __init__.py 
Log Message:
Merged yuppie-collector067-branch:

- Moved URLTool to CMFCore. (Collector #67)


=== CMF/CMFCore/ActionProviderBase.py 1.13 => 1.14 ===
--- CMF/CMFCore/ActionProviderBase.py:1.13	Sat Jul  6 18:47:48 2002
+++ CMF/CMFCore/ActionProviderBase.py	Wed Dec 11 17:20:36 2002
@@ -24,11 +24,16 @@
 from Expression import Expression
 from utils import _dtmldir
 
+from interfaces.portal_actions import ActionProvider as IActionProvider
+
 
 class ActionProviderBase:
 
     """ Provide ActionTabs and management methods for ActionProviders
     """
+
+    __implements__ = IActionProvider
+
     security = ClassSecurityInfo()
 
     _actions = ()


=== CMF/CMFCore/__init__.py 1.20 => 1.21 ===
--- CMF/CMFCore/__init__.py:1.20	Thu Nov 21 12:53:29 2002
+++ CMF/CMFCore/__init__.py	Wed Dec 11 17:20:36 2002
@@ -19,6 +19,7 @@
 import MembershipTool, WorkflowTool, CatalogTool, DiscussionTool
 import ActionsTool, UndoTool, RegistrationTool, SkinsTool
 import MemberDataTool, TypesTool
+import URLTool
 import DirectoryView, FSImage, FSFile, FSPropertiesObject
 import FSDTMLMethod, FSPythonScript, FSSTXMethod
 import FSZSQLMethod
@@ -57,6 +58,7 @@
     SkinsTool.SkinsTool,
     MemberDataTool.MemberDataTool,
     TypesTool.TypesTool,
+    URLTool.URLTool,
     )