[Checkins] SVN: CMF/trunk/ Merged r78275 from the 2.1 branch

[Hanno Schlichting]

Log message for revision 78276:
  Merged r78275 from the 2.1 branch
  

Changed:
  U   CMF/trunk/CMFActionIcons/profiles/actionicons/componentregistry.xml
  U   CMF/trunk/CMFDefault/profiles/default/componentregistry.xml
  U   CMF/trunk/CMFUid/profiles/default/componentregistry.xml
  U   CMF/trunk/HISTORY.txt

-=-
Modified: CMF/trunk/CMFActionIcons/profiles/actionicons/componentregistry.xml
===================================================================
--- CMF/trunk/CMFActionIcons/profiles/actionicons/componentregistry.xml	2007-07-21 21:01:26 UTC (rev 78275)
+++ CMF/trunk/CMFActionIcons/profiles/actionicons/componentregistry.xml	2007-07-21 21:04:52 UTC (rev 78276)
@@ -4,6 +4,6 @@
  <utilities>
   <utility
      interface="Products.CMFActionIcons.interfaces.IActionIconsTool"
-     object="/portal_actionicons"/>
+     object="portal_actionicons"/>
  </utilities>
 </componentregistry>

Modified: CMF/trunk/CMFDefault/profiles/default/componentregistry.xml
===================================================================
--- CMF/trunk/CMFDefault/profiles/default/componentregistry.xml	2007-07-21 21:01:26 UTC (rev 78275)
+++ CMF/trunk/CMFDefault/profiles/default/componentregistry.xml	2007-07-21 21:04:52 UTC (rev 78276)
@@ -4,27 +4,27 @@
  <utilities>
   <utility
      interface="Products.CMFCore.interfaces.IDiscussionTool"
-     object="/portal_discussion"/>
+     object="portal_discussion"/>
   <utility
      interface="Products.CMFCore.interfaces.IMetadataTool"
-     object="/portal_metadata"/>
+     object="portal_metadata"/>
   <utility
      interface="Products.CMFCore.interfaces.IPropertiesTool"
-     object="/portal_properties"/>
+     object="portal_properties"/>
   <utility
      interface="Products.CMFCore.interfaces.ISiteRoot"
-     object="/"/>
+     object=""/>
   <utility
      interface="Products.CMFCore.interfaces.ISyndicationTool"
-     object="/portal_syndication"/>
+     object="portal_syndication"/>
   <utility
      interface="Products.CMFCore.interfaces.IUndoTool"
-     object="/portal_undo"/>
+     object="portal_undo"/>
   <utility
      interface="Products.GenericSetup.interfaces.ISetupTool"
-     object="/portal_setup"/>
+     object="portal_setup"/>
   <utility
      interface="Products.MailHost.interfaces.IMailHost"
-     object="/MailHost"/>
+     object="MailHost"/>
  </utilities>
 </componentregistry>

Modified: CMF/trunk/CMFUid/profiles/default/componentregistry.xml
===================================================================
--- CMF/trunk/CMFUid/profiles/default/componentregistry.xml	2007-07-21 21:01:26 UTC (rev 78275)
+++ CMF/trunk/CMFUid/profiles/default/componentregistry.xml	2007-07-21 21:04:52 UTC (rev 78276)
@@ -4,9 +4,9 @@
  <utilities>
   <utility
      interface="Products.CMFUid.interfaces.IUniqueIdGenerator"
-     object="/portal_uidgenerator"/>
+     object="portal_uidgenerator"/>
   <utility
      interface="Products.CMFUid.interfaces.IUniqueIdAnnotationManagement"
-     object="/portal_uidannotation"/>
+     object="portal_uidannotation"/>
  </utilities>
 </componentregistry>

Modified: CMF/trunk/HISTORY.txt
===================================================================
--- CMF/trunk/HISTORY.txt	2007-07-21 21:01:26 UTC (rev 78275)
+++ CMF/trunk/HISTORY.txt	2007-07-21 21:04:52 UTC (rev 78276)
@@ -1,3 +1,11 @@
+CMF 2.1.0-beta3 (unreleased)
+
+  Bug Fixes
+
+    - Fixed all componentregistry.xml files to use plain object paths and strip
+      and slashes. GenericSetup does only support registering objects which are
+      in the site root.
+
 CMF 2.1.0-beta (2007/03/09)
 
   IMPORTANT NOTE: