[Checkins] SVN: zope3org/trunk/src/zorg/ Update imports of annotation module, to affect changes in zope 3.3b1

[Mikhail Kashkin]

Log message for revision 69414:
  Update imports of annotation module, to affect  changes in zope 3.3b1

Changed:
  U   zope3org/trunk/src/zorg/comment/README.txt
  U   zope3org/trunk/src/zorg/comment/configure.zcml
  U   zope3org/trunk/src/zorg/edition/configure.zcml
  U   zope3org/trunk/src/zorg/edition/demo/configure.zcml
  U   zope3org/trunk/src/zorg/seen/configure.zcml

-=-
Modified: zope3org/trunk/src/zorg/comment/README.txt
===================================================================
--- zope3org/trunk/src/zorg/comment/README.txt	2006-08-11 21:40:50 UTC (rev 69413)
+++ zope3org/trunk/src/zorg/comment/README.txt	2006-08-12 01:15:03 UTC (rev 69414)
@@ -6,7 +6,7 @@
 on the annotations mechanism. We implement a subject that we are going to
 comment afterward:
 
-    >>> from zope.app.container.contained import Contained
+    >>> from zope.container.contained import Contained
     >>> from zope.interface import implements
     >>> from zorg.comment import IAttributeAnnotableComments
 

Modified: zope3org/trunk/src/zorg/comment/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/comment/configure.zcml	2006-08-11 21:40:50 UTC (rev 69413)
+++ zope3org/trunk/src/zorg/comment/configure.zcml	2006-08-12 01:15:03 UTC (rev 69414)
@@ -6,7 +6,7 @@
   <class class=".comments.Comment">
     <factory id="comment.interfaces.IComment" />
     <implements 
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
     <require
         permission="zope.Public"
@@ -60,7 +60,7 @@
   <adapter
       provides=".IComments"
       factory=".comments.CommentsForAnnotableComments"
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       trusted="True" />
       
 

Modified: zope3org/trunk/src/zorg/edition/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/edition/configure.zcml	2006-08-11 21:40:50 UTC (rev 69413)
+++ zope3org/trunk/src/zorg/edition/configure.zcml	2006-08-12 01:15:03 UTC (rev 69414)
@@ -10,7 +10,7 @@
   -->  
   <localUtility class=".storage.SimpleHistoryStorage">
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" />
   </localUtility>   
   
   <!-- We also need a 'IVersionableAspects' multi adapter beeing responsible
@@ -63,16 +63,16 @@
   <class class="zorg.edition.storage.SimpleHistoryStorage">
    
     <require
-			permission="zope.ManageSite"
-			interface="zorg.edition.interfaces.IHistoryStorage"/>
+                        permission="zope.ManageSite"
+                        interface="zorg.edition.interfaces.IHistoryStorage"/>
         
   </class>  
   
   <class class="zorg.edition.storage.VersionHistory">
    
     <require
-			permission="zope.ManageSite"
-			interface="zorg.edition.interfaces.IVersionHistory"/>
+                        permission="zope.ManageSite"
+                        interface="zorg.edition.interfaces.IVersionHistory"/>
         
   </class> 
   

Modified: zope3org/trunk/src/zorg/edition/demo/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/edition/demo/configure.zcml	2006-08-11 21:40:50 UTC (rev 69413)
+++ zope3org/trunk/src/zorg/edition/demo/configure.zcml	2006-08-12 01:15:03 UTC (rev 69414)
@@ -10,7 +10,7 @@
   <include package=".browser" /> 
   
   <class class=".vproposal.VProposal">
-    <implements interface="zope.app.annotation.IAttributeAnnotatable"/>  
+    <implements interface="zope.annotation.IAttributeAnnotatable"/>  
     <require permission="zope.View"
              interface=".interfaces.IVProposal" />
     <require permission="zope.ManageContent"

Modified: zope3org/trunk/src/zorg/seen/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/seen/configure.zcml	2006-08-11 21:40:50 UTC (rev 69413)
+++ zope3org/trunk/src/zorg/seen/configure.zcml	2006-08-12 01:15:03 UTC (rev 69414)
@@ -23,7 +23,7 @@
 
   <adapter
       provides=".interfaces.ISeen"
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       factory=".seen.SeenForAnnotableObjects"
       trusted="True" />