[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n - i18n.zcml:1.1.2.4

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	i18n.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/I18n/i18n.zcml 1.1.2.3 => 1.1.2.4 ===
 >
 
-  <serviceType name="LanguageNegotiation" 
-               interface="Zope.I18n.INegotiator." />
-  <service name="LanguageNegotiation" 
-           component="Zope.I18n.Negotiator.negotiator" />
+  <serviceType
+      id="LanguageNegotiation" 
+      interface=".INegotiator." />
+  <service
+      serviceType="LanguageNegotiation" 
+      component=".Negotiator.negotiator" />
 
 <!-- Language negotiation adapter 
 <adapter factory="Zope.Publisher.Browser.BrowserLanguages."
@@ -18,24 +20,26 @@
          />
 -->
 
-
-<security:protectClass class=".TranslationService.">
-   <security:protect interface="Zope.I18n.ITranslationService." 
-                     permission_id="Zope.I18n" />
-   <security:protect interface="Zope.App.OFS.Container.IContainer." 
-                     permission_id="Zope.ManageServices" />
-</security:protectClass>
-
-<security:protectClass class=".MessageCatalog.">
-   <security:protect interface=".IMessageCatalog." 
-                     permission_id="Zope.Security" />
-</security:protectClass>
-
-
-<service:factoryFromClass name="TranslationService"
-                          class=".TranslationService."
-                          permission_id="Zope.ManageServices"
-                          title="Translation Service" />
+<content class=".TranslationService.">
+   <security:require permission="Zope.I18n"
+                     interface="Zope.I18n.ITranslationService." 
+                     />
+   <security:require permission="Zope.ManageServices"
+                     interface="Zope.App.OFS.Container.IContainer." 
+                     />
+</content>
+
+<content class=".MessageCatalog.">
+   <security:require permission="Zope.Security"
+                     interface=".IMessageCatalog." 
+                     />
+
+</content>
+
+    <service:factoryFromClass id="TranslationService"
+                     class=".MessageCatalog."
+                     permission="Zope.ManageServices"
+                     title="Translation Service" />
 
 <!--factory component=".MessageCatalog." /-->