[Zope-book] CVS: Docs/ZopeComponentArchitecture/PythonProgrammerTutorial/Chapter1/Step6 - Contact.zcml:1.3

[Steve Alexander]

Update of /cvs-repository/Docs/ZopeComponentArchitecture/PythonProgrammerTutorial/Chapter1/Step6
In directory cvs.zope.org:/tmp/cvs-serv32530/Step6

Modified Files:
	Contact.zcml 
Log Message:
added OpenOffice 1.0 version of the slides.
This will be the canonical version of the slides.

Note: I need to find out whether the Luxi fonts are a standard part of
OpenOffice, and change the fonts to standard ones otherwise.


=== Docs/ZopeComponentArchitecture/PythonProgrammerTutorial/Chapter1/Step6/Contact.zcml 1.2 => 1.3 ===
    xmlns:browser='http://namespaces.zope.org/browser'>
 
+
 <security:permission
-   permission_id=".Contact.ManageContacts" 
+   id="ZopeProducts.Contact.ManageContacts" 
    title="Manage Contacts" />
 
-<security:protectClass name=".Contact.">
-  <security:protect interface=".IContactInfo."  
-                    permission_id="Zope.View" />
-  <security:instances permission_id="Zope.View"/>
-  <security:protect methods="update"
-                    permission_id=".Contact.ManageContacts"/>
-</security:protectClass>
-
-<security:protectClass name=".ContactInfoView.">
-  <security:protect interface=".IPostal.IPostalInfo."  
-                    permission_id="Zope.View" />
-  <security:instances permission_id="Zope.View"/>
-  <security:protect methods="index"
-                    permission_id="Zope.View" />
-</security:protectClass>
-
-<security:protectClass name=".ContactEditView."
-                       permission_id=".Contact.ManageContacts"
-                       methods="index, action" />
-
-<zmi:factoryFromClass name=".Contact." 
-                  permission_id=".Contact.ManageContacts"
-                  title="Personal Contact Information" />
-
-<browser:defaultView for=".IContactInfo."
-                     name="info"
-                     factory=".ContactInfoView." />
-
-<browser:view for=".IContactEdit."
-              name="edit"
-              factory=".ContactEditView." />
+<content class=".Contact.">
+  <zmi:factory
+      id="Contact"
+      permission="ZopeProducts.Contact.ManageContacts"
+      title="Personal Contact Information" />
+  <security:require
+      permission="Zope.View"
+      interface=".IContactInfo." />
+  <security:require
+      permission="ZopeProducts.Contact.ManageContacts"
+      attributes="update" />
+</content>
+
+<content class=".ContactInfoView.">
+  <security:require
+      permission="Zope.View"
+      interface=".IPostal.IPostalInfo." />
+  <security:require
+      permission="Zope.View"
+      attributes="index" />      
+</content>
+
+<content class=".ContactEditView.">
+  <security:require
+      permission="ZopeProducts.Contact.ManageContacts"
+      attributes="index action" />      
+</content>
+
+
+<browser:defaultView
+    for=".IContactInfo."
+    name="info"
+    factory=".ContactInfoView." />
+
+<browser:view
+    for=".IContactEdit."
+    name="edit"
+    factory=".ContactEditView.">
+
+    <browser:page name="editForm.html" attribute="index" />
+    <browser:page name="edit.html" attribute="action" />
+</browser:view>
 
 <zmi:tabs for=".IContact.">
-  <zmi:tab label="Edit"     action="edit;view"/>
-  <zmi:tab label="View"     action="info;view"/>
+  <zmi:tab label="Edit" action="edit.html"/>
+  <zmi:tab label="View" action="info.html"/>
 </zmi:tabs>
 
 <zmi:icon for=".IContact." file="Contact/contact.gif" />
 
-<security:protectClass 
-    name=".stubpostal.Lookup"
-    interface=".IPostal.IPostalLookup."
-    permission_id="Zope.Public"  />
-
-<security:protectClass
-    name=".stubpostal.Info"
-    interface=".IPostal.IPostalInfo" 
-    permission_id="Zope.Public" />
+<!-- should this still be here? -->
+<content class=".stubpostal.Info">
+  <security:require
+      permission="Zope.Public"
+      interface=".IPostal.IPostalInfo" />
+</content>
 
 <utility
     component=".stubpostal.lookup" 
-    provides=".IPostal.IPostalLookup" />
-
-<security:protectClass name=".ContactCityState."
-  interface=".IPostal.IPostalInfo"
-  permission_id="Zope.Public"  />
+    provides=".IPostal.IPostalLookup"
+    permission="Zope.Public" />
 
 <adapter
   factory=".ContactCityState."
   provides=".IPostal.IPostalInfo" 
-  for=".IContactInfo." />
+  for=".IContactInfo."
+  permission="Zope.Public" />
 
 
 </zopeConfigure>