[Checkins] SVN: Products.CMFCore/branches/rossp-intid/ Use five.intid to handle keyreferences for acquisition wrapped objects

[Ross Patterson]

Log message for revision 123267:
  Use five.intid to handle keyreferences for acquisition wrapped objects
  until we do away with aq.

Changed:
  U   Products.CMFCore/branches/rossp-intid/Products/CMFCore/content.zcml
  U   Products.CMFCore/branches/rossp-intid/setup.py

-=-
Modified: Products.CMFCore/branches/rossp-intid/Products/CMFCore/content.zcml
===================================================================
--- Products.CMFCore/branches/rossp-intid/Products/CMFCore/content.zcml	2011-11-02 23:58:05 UTC (rev 123266)
+++ Products.CMFCore/branches/rossp-intid/Products/CMFCore/content.zcml	2011-11-03 00:21:20 UTC (rev 123267)
@@ -2,9 +2,6 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:five="http://namespaces.zope.org/five">
 
-  <include package="zope.keyreference" />
-  <include package="zope.intid" file="subscribers.zcml" />
-
   <adapter
       name="add"
       factory=".namespace.AddViewTraverser"
@@ -42,4 +39,22 @@
       factory=".CatalogTool.getObjectWrapperKeyReference"
       trusted="y" />
 
+  <adapter 
+      for="Products.CMFCore.interfaces.IDynamicType"
+      factory="five.intid.keyreference.KeyReferenceToPersistent"
+      trusted="y"
+      />
+  <adapter factory="five.intid.keyreference.connectionOfPersistent"
+           />
+  <subscriber
+      handler="five.intid.intid.removeIntIdSubscriber"
+      for="Products.CMFCore.interfaces.IDynamicType
+           zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+      />
+  <subscriber
+      handler="five.intid.intid.moveIntIdSubscriber"
+      for="Products.CMFCore.interfaces.IDynamicType
+           zope.lifecycleevent.interfaces.IObjectMovedEvent"
+      />
+  
 </configure>

Modified: Products.CMFCore/branches/rossp-intid/setup.py
===================================================================
--- Products.CMFCore/branches/rossp-intid/setup.py	2011-11-02 23:58:05 UTC (rev 123266)
+++ Products.CMFCore/branches/rossp-intid/setup.py	2011-11-03 00:21:20 UTC (rev 123267)
@@ -50,6 +50,7 @@
           'five.localsitemanager',
           'Products.GenericSetup',
           'Products.ZSQLMethods',
+          'five.intid',
           ],
       tests_require=[
           'zope.testing >= 3.7.0',