[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image - configure.zcml:1.9.2.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Image
In directory cvs.zope.org:/tmp/cvs-serv10951/lib/python/Zope/App/OFS/Content/Image

Modified Files:
      Tag: ZopeDublinCore-branch
	configure.zcml 
Log Message:
Commiting branch prior to merge

=== Zope3/lib/python/Zope/App/OFS/Content/Image/configure.zcml 1.9 => 1.9.2.1 ===
--- Zope3/lib/python/Zope/App/OFS/Content/Image/configure.zcml:1.9	Thu Aug  1 12:06:41 2002
+++ Zope3/lib/python/Zope/App/OFS/Content/Image/configure.zcml	Fri Oct  4 13:30:10 2002
@@ -5,26 +5,28 @@
   <permission id="Zope.AddImages" title="Add Images" />
 
   <content class=".Image.">
+
     <factory
         id="Image"
         permission="Zope.ManageContent"
         title="Image"
         description="An Image" />
+
     <require
         permission="Zope.View"
         interface="Zope.App.OFS.Content.File.IFile.IReadFile" />
+
     <require
         permission="Zope.View"
         interface=".Image.IImage" />
+
     <require
         permission="Zope.ManageContent"
         interface="Zope.App.OFS.Content.File.IFile.IWriteFile" />
-  </content>
 
-  <adapter
-      factory="Zope.App.OFS.Annotation.AttributeAnnotations."
-      provides="Zope.App.OFS.Annotation.IAnnotations."
-      for=".Image.IImage" />
+    <implements interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
+
+  </content>
 
   <content class=".I18nImage.">
     <factory
@@ -47,14 +49,10 @@
     <require
         permission="Zope.ManageContent"
         attributes="setDefaultLanguage removeLanguage" />
-  </content>
 
-  <adapter
-      factory="Zope.App.OFS.Annotation.AttributeAnnotations."
-      provides="Zope.App.OFS.Annotation.IAnnotations."
-      for=".I18nImage.II18nImage" />
+    <implements interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
 
-  <!-- Further Directives -->
+  </content>
 
   <include package=".Views" />