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

[Jim Fulton]

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

Modified Files:
	configure.zcml 
Log Message:
implemented:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/MergeSecurityIntoZopeNamespace

While I was at it, I couldn't resist implementing a variation of:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/SecurityPackageReorg

which was a lot more work. 



=== Zope3/lib/python/Zope/App/OFS/Content/Image/configure.zcml 1.3 => 1.4 ===
    xmlns='http://namespaces.zope.org/zope'
-   xmlns:security='http://namespaces.zope.org/security'
    xmlns:zmi='http://namespaces.zope.org/zmi'
    xmlns:browser='http://namespaces.zope.org/browser'
 >
-  <security:permission id="Zope.AddImages" title="Add Images" />
+  <permission id="Zope.AddImages" title="Add Images" />
   
   <content class=".Image.">
     <zmi:factory
@@ -12,13 +11,13 @@
         permission="Zope.ManageContent"
         title="Image"
         description="An Image" />
-    <security:require
+    <require
         permission="Zope.View"
         interface="Zope.App.OFS.Content.File.IFile.IReadFile" />
-    <security:require
+    <require
         permission="Zope.View"
         interface=".Image.IImage" />
-    <security:require
+    <require
         permission="Zope.ManageContent"
         interface="Zope.App.OFS.Content.File.IFile.IWriteFile" />
   </content>