[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder - folder.zcml:1.1.4.4.2.2

[Jim Fulton]

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

Modified Files:
      Tag: Zope3InWonderland-branch
	folder.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/Folder/folder.zcml 1.1.4.4.2.1 => 1.1.4.4.2.2 ===
   <zmi:factoryFromClass name="Folder"
                         class=".Folder."
-                        permission_id="Zope.ManageContent"
+                        permission="Zope.ManageContent"
                         title="Son of Folder"
                         description="Minimal folder" />
 
   <security:protectClass class=".Folder."
-                         permission_id="Zope.View">
+                         permission="Zope.View">
     <security:protect 
       interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
-              permission_id="Zope.Public" />
+              permission="Zope.Public" />
     <security:protect 
        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
-              permission_id="Zope.ManageServices" />
+              permission="Zope.ManageServices" />
     <security:protect
               interface="Zope.App.OFS.Container.IContainer.IReadContainer"
-              permission_id="Zope.View" />
+              permission="Zope.View" />
     <security:protect
               interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
-              permission_id="Zope.ManageContent" />
+              permission="Zope.ManageContent" />
   </security:protectClass>
 
   <!-- XXX Do we really need RootFolder? -->
@@ -42,36 +42,36 @@
 
   <zmi:factoryFromClass name="LoadedFolder"
                         class=".LoadedFolder."
-                        permission_id="Zope.ManageContent"
+                        permission="Zope.ManageContent"
                         title="Loaded Folder"
                         description="A Folder having all the goodies." />
 
   <security:protectClass class=".LoadedFolder."
-                         permission_id="Zope.View">
+                         permission="Zope.View">
     <security:protect 
               interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
-              permission_id="Zope.Public" />
+              permission="Zope.Public" />
     <security:protect 
               interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
-              permission_id="Zope.ManageServices" />
+              permission="Zope.ManageServices" />
     <security:protect
               interface="Zope.App.OFS.Container.IContainer.IReadContainer"
-              permission_id="Zope.View" />
+              permission="Zope.View" />
     <security:protect
               interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
-              permission_id="Zope.ManageContent" />
+              permission="Zope.ManageContent" />
     <security:protect
               interface="Zope.App.OFS.Container.IOrderedContainer.IReadOrderedContainer"
-              permission_id="Zope.View" />
+              permission="Zope.View" />
     <security:protect
               interface="Zope.App.OFS.Container.IOrderedContainer.IWriteOrderedContainer"
-              permission_id="Zope.ManageContent" />
+              permission="Zope.ManageContent" />
     <security:protect
               interface="Zope.App.OFS.Container.IContainerLimit.IReadContainerLimit"
-              permission_id="Zope.View" />
+              permission="Zope.View" />
     <security:protect
               interface="Zope.App.OFS.Container.IContainerLimit.IWriteContainerLimit"
-              permission_id="Zope.ManageContent" />
+              permission="Zope.ManageContent" />
   </security:protectClass>