[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI - zmi.zcml:1.1.2.9.2.2

Steve Alexander steve@cat-box.net
Mon, 3 Jun 2002 18:57:55 -0400


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

Modified Files:
      Tag: Zope3InWonderland-branch
	zmi.zcml 
Log Message:
wonderland updates to zcml files.


=== Zope3/lib/python/Zope/App/ZMI/zmi.zcml 1.1.2.9.2.1 => 1.1.2.9.2.2 ===
 >
 
-  <serviceType name="ZMIViewService"
-           interface=".IZMIViewService." />
+  <serviceType id="ZMIViewService"
+               interface=".IZMIViewService." />
 
-  <service name="ZMIViewService"
-       component=".ZMIViewService.ZMIViews" />
+  <service serviceType="ZMIViewService"
+           component=".ZMIViewService.ZMIViews" />
 
   <browser:view name="standard_macros"
                 factory=".StandardMacros." />
@@ -17,18 +17,23 @@
   <browser:view name="ZMIUtility"
                 factory=".ZMIViewUtility." />
 
-  <security:protectClass class=".StandardMacros."
-                         permission="Zope.View"/>
-
-  <security:protectClass class=".ZMIViewUtility."
-                         permission="Zope.View"
-                         names="getZMIViews"/>
-
-  <security:protectClass 
-    class=".IGenericCreatorMarker."
-    interface=".IGenericCreatorMarker."
-    permission="Zope.ManageContent"  />
-    
-    <include package=".Views" file="views.zcml" />
+  <content class=".StandardMacros.">
+    <security:require
+        permission="Zope.View" />
+  </content>
+  
+  <content class=".ZMIViewUtility.">
+    <security:require
+        permission="Zope.View"
+        attributes="getZMIViews" />
+  </content>
+  
+  <content class=".IGenericCreatorMarker.">
+    <security:require  
+        permission="Zope.ManageContent"
+        interface=".IGenericCreatorMarker." />
+  </content>
+  
+  <include package=".Views" file="views.zcml" />
 
 </zopeConfigure>