[Zope-Checkins] CVS: Zope3/lib/python/Zope - zope.zcml:1.1.2.11

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv12187/lib/python/Zope

Modified Files:
      Tag: Zope-3x-branch
	zope.zcml 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/zope.zcml 1.1.2.10 => 1.1.2.11 ===
 <!-- Standard configuration directives -->
 <include package=".Configuration" file="configuration-meta.zcml" />
-<include package=".ComponentArchitecture" file="component-meta.zcml" />
 <include package=".App" file="app-meta.zcml" />
 <include package=".Publisher" file="publisher-meta.zcml" />
 <include package=".Event" file="event-meta.zcml" />
@@ -15,20 +14,37 @@
 
 
 <!-- Standard Permissions -->
-<security:permission permission_id="Zope.View" title="View" />
-<security:permission permission_id="Zope.Security"
-   title="Change security settings" />
-<security:permission permission_id="Zope.ManageContent" 
-   title="Manage Content" />
-<security:permission permission_id="Zope.ManageBindings" 
-   title="Manage Service Bindings" />
-<security:permission permission_id="Zope.ManageServices" 
-   title="Manage Services" />
-<security:permission permission_id="Zope.ManageApplication" 
-   title="Manage Application" />
+
+<security:permission id="Zope.View"
+                     title="View"
+                     />
+
+<security:permission id="Zope.Security"
+                     title="Change security settings"
+                     />
+
+<security:permission id="Zope.ManageContent" 
+                     title="Manage Content"
+                     />
+
+<security:permission id="Zope.ManageBindings" 
+                     title="Manage Service Bindings"
+                     />
+
+<security:permission id="Zope.ManageServices" 
+                     title="Manage Services"
+                      />
+
+<security:permission id="Zope.ManageApplication" 
+                     title="Manage Application"
+                     />
+
+<!-- XXX What is this for? -->
+<security:permission id="Zope.I18n" 
+                     title="Manage Application"
+                     />
 
 <!-- Configuration -->
-<include package=".ComponentArchitecture" file="component.zcml" />
 <include package=".App" file="app.zcml" />
 <include package=".I18n" file="i18n.zcml" />
 <include package=".Publisher" file="publisher.zcml" />