Upgrade to Content Management Framework 1.3

4 files changed, 273 insertions, 29 deletions

diff --git a/www/zope-cmf/Makefile b/www/zope-cmf/Makefile
index 227b4b681d4e..c9fad5db4f6b 100644
--- a/www/zope-cmf/Makefile
+++ b/www/zope-cmf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope-cmf
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 CATEGORIES=	www zope
 MASTER_SITES=	http://cmf.zope.org/download/CMF-${PORTVERSION}/
 DISTNAME=	CMF-${PORTVERSION}
diff --git a/www/zope-cmf/distinfo b/www/zope-cmf/distinfo
index cc5b194f323c..bdc4621532e2 100644
--- a/www/zope-cmf/distinfo
+++ b/www/zope-cmf/distinfo
@@ -1 +1 @@
-MD5 (zope/CMF-1.1.tar.gz) = 94667dd7170dee13d95a8a922cbaf596
+MD5 (zope/CMF-1.3.tar.gz) = 005035675541fb4fa1d06ced804f2baf
diff --git a/www/zope-cmf/pkg-message b/www/zope-cmf/pkg-message
index 5c81778bdb9a..2dec88afd218 100644
--- a/www/zope-cmf/pkg-message
+++ b/www/zope-cmf/pkg-message
@@ -7,9 +7,3 @@ Zope-CMF
 
 	- Verify that the three CMF products loaded properly by examining
 	  them in Control_Panel/Products.
-
-	You may now create a "CMF Site" object.  For further installation and
-	troubleshooting instructions, see:
-
-	  http://cmf.zope.org/download/CMF-1.1/README.txt
-
diff --git a/www/zope-cmf/pkg-plist b/www/zope-cmf/pkg-plist
index b242763f86c9..1532aac0f035 100644
--- a/www/zope-cmf/pkg-plist
+++ b/www/zope-cmf/pkg-plist
@@ -1,3 +1,6 @@
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/CREDITS.txt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/CalendarTool.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/CalendarTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/DEPENDENCIES.txt
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Event.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Event.pyc
@@ -5,33 +8,60 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/EventPermissions.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Extensions/Install.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Extensions/Install.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Extensions/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Extensions/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/INSTALL.txt
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/README.txt
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/TODO.txt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/VERSION.txt
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/help/placeholder.txt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/image_sources/event_info_tab.psd
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/calendar.gif
-%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/calendar_day_view.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_edit.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_edit.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_edit_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_info_tab.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_view.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/event_view1a.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar/space.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/CalendarStyle.css
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/calendarBox.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/calendar_day_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/event_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/event_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getDaysClass.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getEndAsString.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getMonthAndYear.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getNextDayLink.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getNextMonthLink.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getPreviousDayLink.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getPreviousMonthLink.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar/getStartAsString.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/test_Calendar.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/test_Calendar.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/test_Event.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/test_Event.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/test_all.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests/test_all.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tool.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/version.txt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/www/configureCalendarTool.zpt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/www/explainCalendarTool.zpt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ActionInformation.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ActionInformation.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ActionProviderBase.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ActionProviderBase.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ActionsTool.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ActionsTool.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CMFCatalogAware.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CMFCatalogAware.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CMFCorePermissions.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CMFCorePermissions.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CachingPolicyManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CachingPolicyManager.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CatalogTool.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/CatalogTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/ContentTypeRegistry.py
@@ -44,18 +74,24 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/DiscussionTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/DynamicType.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/DynamicType.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/Expression.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/Expression.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSDTMLMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSDTMLMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSImage.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSImage.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSObject.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSPageTemplate.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSPageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSPropertiesObject.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSPropertiesObject.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSSTXMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSSTXMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSZSQLMethod.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/FSZSQLMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/MemberDataTool.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/MemberDataTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/MembershipTool.py
@@ -90,13 +126,18 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/addInstance.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/addTypeInfo.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/addWorkflow.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/cachingPolicies.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/catalogFind.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custdtml.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custimage.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custprops.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custpt.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custpy.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custstx.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/custzsql.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/dirview_properties.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/editActions.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/editToolsActions.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/explainActionsTool.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/explainCatalogTool.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/explainDiscussionTool.dtml
@@ -109,6 +150,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/explainWorkflowTool.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/extensionWidget.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/majorMinorWidget.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/manageActionProviders.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/memberdataContents.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/membershipRolemapping.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/mimetypePredEdit.dtml
@@ -117,15 +159,20 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/registryTest.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/selectWorkflows.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/skinProps.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml/zmi_workflows.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/folderAdd.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/cookie.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/dirview.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/fsdtml.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/fsimage.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/fsprops.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/fspt.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/fspy.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/fssqlmethod.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/registry.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images/typeinfo.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/CachingPolicyManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/CachingPolicyManager.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/ContentTypeRegistry.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/ContentTypeRegistry.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/Contentish.py
@@ -144,6 +191,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/ReviewableContent.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/Syndicatable.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/Syndicatable.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/portal_actions.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/portal_actions.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces/portal_catalog.py
@@ -170,12 +219,57 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/register.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/content.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/content.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/dummy.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/dummy.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/security.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/security.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/testcase.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/testcase.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/utils.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base/utils.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/test1.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/test4.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/test4.py.security
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/test5.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/testPT.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/testPT.pt.properties
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/testPTbad.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/testXMLPT.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin/test_image.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ActionInformation.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ActionInformation.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ActionProviderBase.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ActionProviderBase.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ActionsTool.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ActionsTool.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_CachingPolicyManager.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_CachingPolicyManager.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_CatalogTool.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_CatalogTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ContentTypeRegistry.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_ContentTypeRegistry.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_DirectoryView.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_DirectoryView.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_Expression.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_Expression.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSImage.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSImage.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSPageTemplate.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSPageTemplate.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSPythonScript.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSPythonScript.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSSecurity.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_FSSecurity.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_PortalFolder.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_PortalFolder.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_TypesTool.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_TypesTool.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_WorkflowTool.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_WorkflowTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_all.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/test_all.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tool.gif
@@ -192,10 +286,14 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Document.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/DublinCore.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/DublinCore.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/Upgrade.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/Upgrade.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/fix_cmf_permissions.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/fix_cmf_permissions.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/migrate_ptk.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/migrate_ptk.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/update_catalogIndexes.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/update_catalogIndexes.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/update_discussion.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions/update_discussion.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Favorite.py
@@ -245,11 +343,44 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/dtml/synProps.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/dtml/synReports.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/dtml/zmi_editDocument.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/dtml/zmi_editLink.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/dtml/zmi_metadata.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ActorDefinitions.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Actor_ContentCreator.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Actor_MembershipManager.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Actor_Reviewer.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Actor_SiteDesigner.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Actor_SiteManager.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Actor_SiteVisitor.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/AddContentFolders.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ApproveForPublication.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/BecomeAMember.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/BrowseCMFSiteHomepage.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/BrowseNewsItems.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/BrowseSubmittedForReview.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ChangeContent.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ConfigureCMFSite.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ConfigurePersonalization.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/CreateCMFFolder.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/CreateCMFSite.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/CreateCMFTopic.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/CreateNewContent.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/LoginAsMember.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ManageLocalRoles.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/MoveCopyContent.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ProvideFeedback.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/RemoveContent.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/RenameContent.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/SearchCMFSite.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/SubmitContentForPublication.stx
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Syndication-Tool_Overview.stx
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Syndication-Tool_Policies.stx
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Syndication-Tool_Properties.stx
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/Syndication-Tool_Reporting.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/TODO.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/UndoChanges.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/UnpublishContent.stx
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/help/ViewMyContent.stx
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/images/workflow.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/interfaces/Syndicatable.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/interfaces/Syndicatable.pyc
@@ -259,15 +390,19 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/scripts/addImagesToSkinPaths.pys
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/scripts/convertCatalogGetIconColumn.pys
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/UpFolder_icon.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/Zope_logo.gif
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/c.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/go.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/logo.jpg
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/logo.png
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/spacer.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/Images/tinyzope.jpg
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/aboveInThread.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_hide_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_publish_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_reject_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_retract_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_show_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_status_history.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_status_modify.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/content_status_modify.pyc
@@ -302,52 +437,63 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/link_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/link_view.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/metadata_edit.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/metadata_edit.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/metadata_edit_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/newsitem_edit.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/newsitem_edit.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/newsitem_edit_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/newsitem_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/content/newsitem_view.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/addtoFavorites.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/change_password.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/disableSyndication.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/editSynProperties.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/enableSyndication.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/addtoFavorites.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/change_password.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/disableSyndication.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/editSynProperties.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/enableSyndication.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/expireAuthCookie.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/expireAuthCookie.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/finish_portal_construction.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_copy.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_cut.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_delete.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_paste.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_rename.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/logout.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/mail_password.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/personalize.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/reconfig.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/register.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_copy.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_cut.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_delete.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_localrole_edit.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_localrole_edit.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_paste.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_rename.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/folder_rename_items.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/isDiscussable.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/logout.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/mail_password.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/personalize.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/reconfig.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/register.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/search_debug.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/setAuthCookie.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/setAuthCookie.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/synPropertiesForm.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/undo.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/control/undo.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/RSS.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/TitleOrId.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/actions_box.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/clearCookie.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/clearCookie.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/clearCookie.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/content_byline.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/css_inline_or_link.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/default_stylesheet.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/discussion_reply.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/discussion_reply.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/discussion_reply.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/discussion_reply_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/discussion_reply_preview.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/discussion_thread_view.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/doFormSearch.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/filterCookie.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/filterCookie.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/folder_add.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/folder_contents.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/folder_factories.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/folder_filter_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/folder_localrole_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/folder_rename_form.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/iconHTML.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/index_html.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/itemRSS.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/join_form.dtml
@@ -377,11 +523,85 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/standard_html_header.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/standard_top_bar.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/stylesheet_properties.props
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/truncID.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/undo_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic/viewThreadsAtBottom.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/no_css/stylesheet_properties.props
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/nouvelle/nouvelle_stylesheet.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/nouvelle/stylesheet_properties.props
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_hide_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_publish_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_reject_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_retract_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_show_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_status_history.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/content_submit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/discussionitem_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/document_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/document_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/favorite_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/file_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/file_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/folder_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/folder_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/full_metadata_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/image_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/image_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/link_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/link_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/metadata_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/newsitem_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/newsitem_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content/subjectsList.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_control/finish_portal_construction.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_control/reverseList.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_control/synPropertiesForm.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/actions_box.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/breadcrumbs.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/content_byline.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/discussion_reply_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/discussion_reply_preview.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/expanded_title.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/folder_add.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/folder_contents.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/folder_factories.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/folder_filter_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/folder_localrole_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/folder_rename_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/index_html.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/index_html_utils.html
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/join_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/logged_in.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/logged_out.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/login_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/mail_password_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/mail_password_response.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/main_template.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/metadata_help.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/news_box.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/password_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/personalize_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/publishItems.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/publishItems.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/recent_news.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/reconfig_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/registered.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/rejectItems.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/rejectItems.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/review.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/roster.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/rssDisabled.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/search.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/search_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/setup_talkback_tree.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/standard_error_message.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/stxmethod_view.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/talkback_tree.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/unauthRedirect.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/unauthRedirect.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/undo_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/viewThreadsAtBottom.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic/zpt_stylesheet.css
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/TestImage.jpg
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/__init__.pyc
@@ -389,12 +609,18 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Discussions.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Document.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Document.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Favorite.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Favorite.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Image.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Image.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Link.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Link.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_MetadataTool.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_MetadataTool.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_NewsItem.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_NewsItem.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Portal.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_Portal.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_all.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_all.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests/test_join.py
@@ -418,6 +644,8 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/SimpleIntCriterion.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/SimpleStringCriterion.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/SimpleStringCriterion.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/SortCriterion.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/SortCriterion.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/Topic.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/Topic.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/TopicPermissions.py
@@ -433,6 +661,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/friendlydatec_editform.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/listc_edit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/sic_edit.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/sort_edit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/ssc_edit.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/topic_addCriterion.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/topic_addCriterion.pyc
@@ -449,6 +678,15 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/topic_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/topic_subtopics_form.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic/topic_view.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/friendlydatec_editform.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/listc_edit.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/sic_edit.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/sort_edit.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/ssc_edit.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/topic_criteria_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/topic_edit_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/topic_subtopics_form.pt
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic/topic_view.pt
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_DateC.py
@@ -459,12 +697,15 @@
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_SIC.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_SSC.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_SSC.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_SortC.py
+%%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_SortC.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_Topic.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_Topic.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_all.py
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests/test_all.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/version.txt
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/zpt_topic
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins/topic
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/skins
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/interfaces
@@ -472,6 +713,9 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic/Extensions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFTopic
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_generic
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_control
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/zpt_content
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/nouvelle
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/no_css
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/skins/generic
@@ -486,14 +730,20 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault/Extensions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFDefault
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins/fake_skin
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/fake_skins
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests/base
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/interfaces
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/images
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCore
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/www
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/zpt_calendar
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins/calendar
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/skins
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/image_sources
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/help
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar/Extensions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFCalendar