[Zope-Checkins] CVS: Zope3 - site.zcml:1.1.2.7.12.2 z3.py:1.1.2.28.14.2

[Jim Fulton]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv12372

Modified Files:
      Tag: Zope3InWonderland-branch
	site.zcml z3.py 
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/site.zcml 1.1.2.7.12.1 => 1.1.2.7.12.2 ===
 <include package="Zope" file="zope.zcml" />
 
-<security:role role_id="Manager" title="Site Manager" />
-<security:role role_id="Member" title="Site Member" />
+<security:role id="Manager" title="Site Manager" />
+<security:role id="Member" title="Site Member" />
 
 <include file="principals.zcml" />
 
-<security:grantPermissionToRole permission_id="Zope.View" 
-                                role_id="Manager" />
-<security:grantPermissionToRole permission_id="Zope.ManageContent"
-                                role_id="Manager" />
-<security:grantPermissionToRole permission_id="Zope.Security" 
-                                role_id="Manager" />
+<security:grantPermissionToRole permission="Zope.View" 
+                                role="Manager" />
+<security:grantPermissionToRole permission="Zope.ManageContent"
+                                role="Manager" />
+<security:grantPermissionToRole permission="Zope.Security" 
+                                role="Manager" />
 
-<security:grantPermissionToRole permission_id="Zope.ManageServices" 
-                                role_id="Manager" />
+<security:grantPermissionToRole permission="Zope.ManageServices" 
+                                role="Manager" />
 
-<security:grantPermissionToRole permission_id="Zope.ManageApplication" 
-                                role_id="Manager" />
+<security:grantPermissionToRole permission="Zope.ManageApplication" 
+                                role="Manager" />
 
 <include file="products.zcml" />
 


=== Zope3/z3.py 1.1.2.28.14.1 => 1.1.2.28.14.2 ===
     from Zope.Configuration.xmlconfig import XMLConfig
 
-
     # Load server-independent site config
     XMLConfig(os.path.join(dir, 'site.zcml'))()
-
+    
     # Load server config
     XMLConfig(os.path.join(dir, 'zserver.zcml'))()