[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File - file.zcml:1.1.2.5.2.2

[Jim Fulton]

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

Modified Files:
      Tag: Zope3InWonderland-branch
	file.zcml 
Log Message:
- Attribute renaming.

  In directives that define things, renamed thing_id to id. For
  example:

    <permission permission_id='xxx' ...

  became:

    <permission id='xxx' ...

  In directives that used things defined in this way, removed the id
  suffix. For example:

     <view permission_id='xxx' ...

  became:

     <view permission='xxx' ...

- Changed the way that exceptions from configuration files are
  reported. Went back to normal Python tracebacks followed by
  "configuration tracebacks". The configuration tracebacks look
  somewhat similar to Python tracebacks, with file location
  information. The most specific configuration file location is at the
  end of the traceback, followed by the original error type and
  value. 

- Added a testxmlconfig function to the xmlconfig module to support
  unit testing. This function suppresses usual configuration error
  generation so that the original error is raised. This is needed so
  that unit tests can detect that proper low-level errors are raised. 

Note that everyone will need to edit their principals.zcml files to
reflect these changes!



=== Zope3/lib/python/Zope/App/OFS/Content/File/file.zcml 1.1.2.5.2.1 => 1.1.2.5.2.2 ===
   <!-- NaiveFile Directives -->
 
-  <!--security:permission permission_id="Zope.AddNaiveFiles" 
+  <!--security:permission permission="Zope.AddNaiveFiles" 
                        title="Add Naive Files" />
 
   <zmi:factoryFromClass name="NaiveFile"
                         class=".NaiveFile."
-                        permission_id="Zope.AddNaiveFiles"
+                        permission="Zope.AddNaiveFiles"
                         title="Naive File"
                         description="This is a simple file" />
 
   <security:protectClass class=".NaiveFile."
-                         permission_id="Zope.View" /-->
+                         permission="Zope.View" /-->
 
 
   <!-- File Directives -->
 
-  <security:permission permission_id="Zope.AddFiles" title="Add Files" />
+  <security:permission id="Zope.AddFiles" title="Add Files" />
 
   <zmi:factoryFromClass name="File"
                         class=".File."
-                        permission_id="Zope.ManageContent"
+                        permission="Zope.ManageContent"
                         title="File"
                         description="A File" />
 
   <security:protectClass class=".File."
-                         permission_id="Zope.View" >
+                         permission="Zope.View" >
     <security:protect
               interface="Zope.App.OFS.Content.File.IFile.IReadFile"
-              permission_id="Zope.View" />
+              permission="Zope.View" />
     <security:protect
               interface="Zope.App.OFS.Content.File.IFile.IWriteFile"
-              permission_id="Zope.ManageContent" />
+              permission="Zope.ManageContent" />
   </security:protectClass>