[Zope3-checkins] SVN: Zope3/branches/philikon-reduce-zcml/src/ <content> -> <class>

Philipp von Weitershausen philikon at philikon.de
Wed Mar 15 18:59:03 EST 2006


Log message for revision 66053:
  <content>   ->   <class>
  

Changed:
  U   Zope3/branches/philikon-reduce-zcml/src/buddydemo/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/bugtracker/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/z3checkins/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/applicationcontrol/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/groupfolder.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/principalfolder.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/broken/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/catalog/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/component/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/container/browser/ftests/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/container/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure_bare.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/itemvocabulary/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/jobboard/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/passwdauth/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/boolwidget.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/intwidget.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textareawidget.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textwidget.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/dtmlpage/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/error/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/externaleditor/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/file/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/folder/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/http/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/locales.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/i18nfile/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/onlinehelp/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/pagetemplate/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/pluggableauth/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/presentation/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/browser/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/http.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/pythonpage/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/gadflyda.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/fields.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/tests/test_fieldfactory.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/schemacontent/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/security/_protections.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/security/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/session/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/sqlscript/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/undo/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/testobject.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/zptpage/configure.zcml
  U   Zope3/branches/philikon-reduce-zcml/src/zwiki/configure.zcml

-=-
Modified: Zope3/branches/philikon-reduce-zcml/src/buddydemo/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/buddydemo/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/buddydemo/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -7,14 +7,14 @@
 
 <i18n:registerTranslations directory="locales" />
 
-<content class=".buddy.Buddy">
+<class class=".buddy.Buddy">
    <implements 
        interface="zope.app.annotation.IAttributeAnnotatable" />
    <require permission="zope.View"
             interface=".interfaces.IBuddy" />
    <require permission="zope.ManageContent"
             set_schema=".interfaces.IBuddy" />
-</content>
+</class>
 
 <browser:page
     for=".interfaces.IBuddy"
@@ -48,9 +48,9 @@
     view="AddBuddy.html"
     />
 
-<content class=".stubpostal.Info">
+<class class=".stubpostal.Info">
   <allow interface=".interfaces.IPostalInfo" />
-</content>
+</class>
 
 <utility
     factory=".stubpostal.Lookup"
@@ -81,14 +81,14 @@
       />
 </browser:pages>
 
-<content class=".buddy.BuddyFolder">
+<class class=".buddy.BuddyFolder">
   <require permission="zope.View"
            interface="zope.app.container.interfaces.IReadContainer"
            />
   <require permission="zope.ManageContent"
            interface="zope.app.container.interfaces.IWriteContainer"
            />
-</content>
+</class>
 
 <browser:addMenuItem
     title="Buddy Folder"

Modified: Zope3/branches/philikon-reduce-zcml/src/bugtracker/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/bugtracker/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/bugtracker/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -115,52 +115,52 @@
      name="Users"
      />
 
-  <content class=".vocabulary.ManagableVocabulary">
+  <class class=".vocabulary.ManagableVocabulary">
     <allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
     <allow attributes="default title"/>
     <require
         permission="bugtracker.ManageBugTracker"
         attributes="add delete"
         set_attributes="default"/>
-  </content>
+  </class>
 
-  <content class=".vocabulary.StatusVocabulary">
+  <class class=".vocabulary.StatusVocabulary">
     <require like_class=".vocabulary.ManagableVocabulary"/>    
-  </content>
+  </class>
 
-  <content class=".vocabulary.PriorityVocabulary">
+  <class class=".vocabulary.PriorityVocabulary">
     <require like_class=".vocabulary.ManagableVocabulary"/>    
-  </content>
+  </class>
 
-  <content class=".vocabulary.ReleaseVocabulary">
+  <class class=".vocabulary.ReleaseVocabulary">
     <require like_class=".vocabulary.ManagableVocabulary"/>    
-  </content>
+  </class>
 
-  <content class=".vocabulary.BugTypeVocabulary">
+  <class class=".vocabulary.BugTypeVocabulary">
     <require like_class=".vocabulary.ManagableVocabulary"/>    
-  </content>
+  </class>
 
-  <content class=".vocabulary.SimpleTerm">
+  <class class=".vocabulary.SimpleTerm">
     <allow interface="zope.schema.interfaces.ITokenizedTerm"/>
     <allow attributes="title"/>
-  </content>
+  </class>
 
-  <content class=".vocabulary.UserVocabulary">
+  <class class=".vocabulary.UserVocabulary">
     <allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
-  </content>
+  </class>
 
-  <content class=".vocabulary.UserTerm">
+  <class class=".vocabulary.UserTerm">
     <allow
         interface="zope.schema.interfaces.ITokenizedTerm"/>
     <allow attributes="principal title"/>
-  </content>
+  </class>
 
-  <content class=".mail.MailSubscriptions">
+  <class class=".mail.MailSubscriptions">
     <require
         permission="bugtracker.EditBug"
         attributes="addSubscriptions removeSubscriptions" />
     <allow attributes="getSubscriptions" />
-  </content>
+  </class>
 
   <!-- Bug Tracker related configuration -->
 
@@ -169,7 +169,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".tracker.BugTracker">
+  <class class=".tracker.BugTracker">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -195,7 +195,7 @@
         permission="zope.ManageContent"
         set_schema=".interfaces.IBugTracker" />
 
-  </content>
+  </class>
 
   <adapter 
       for=".interfaces.IBugTracker"
@@ -239,7 +239,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".bug.Bug">
+  <class class=".bug.Bug">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"/>
@@ -265,14 +265,14 @@
         permission="bugtracker.AddBug"
         set_schema=".interfaces.IBug" />
 
-  </content>
+  </class>
 
   <adapter 
       factory=".bug.SearchableText"
       provides=".interfaces.ISearchableText"
       for=".interfaces.IBug" />
 
-  <content class=".bug.BugDependencyAdapter">
+  <class class=".bug.BugDependencyAdapter">
 
     <require
         permission="bugtracker.ViewBug"
@@ -284,7 +284,7 @@
                     addDependents deleteDependents" 
         set_schema=".interfaces.IBugDependencies"/>
 
-  </content>
+  </class>
 
   <adapter
       factory=".bug.BugDependencyAdapter"
@@ -301,15 +301,15 @@
 
   <!-- File and Image Attachment related configuration -->
 
-  <content class="zope.app.file.file.File">
+  <class class="zope.app.file.file.File">
     <implements 
         interface="bugtracker.interfaces.IAttachment" />
-  </content>
+  </class>
 
-  <content class="zope.app.file.image.Image">
+  <class class="zope.app.file.image.Image">
     <implements 
         interface="bugtracker.interfaces.IAttachment" />
-  </content>
+  </class>
 
 
   <!-- Comment related configuration -->
@@ -319,7 +319,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".comment.Comment">
+  <class class=".comment.Comment">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"/>
@@ -337,7 +337,7 @@
         permission="bugtracker.AddComment"
         set_schema=".interfaces.IComment" />
 
-  </content>
+  </class>
 
 
   <!-- XML-RPC presentation -->

Modified: Zope3/branches/philikon-reduce-zcml/src/z3checkins/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/z3checkins/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/z3checkins/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -5,7 +5,7 @@
 
 <!-- CheckinMessage content object -->
 
-  <content class=".message.Message">
+  <class class=".message.Message">
 
     <require permission="zope.View"
              interface=".interfaces.IMessage" />
@@ -13,9 +13,9 @@
     <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
-  </content>
+  </class>
 
-  <content class=".message.CheckinMessage">
+  <class class=".message.CheckinMessage">
 
     <require permission="zope.View"
              interface=".interfaces.ICheckinMessage" />
@@ -23,9 +23,9 @@
     <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
-  </content>
+  </class>
 
-  <content class=".folder.CheckinFolder">
+  <class class=".folder.CheckinFolder">
 
      <require permission="zope.View"
               interface="zope.app.container.interfaces.IReadContainer" />
@@ -49,7 +49,7 @@
      <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
-  </content>
+  </class>
 
 <!-- Utilities -->
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/applicationcontrol/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/applicationcontrol/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/applicationcontrol/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -3,12 +3,12 @@
     i18n_domain="zope"
     >
 
-  <content
+  <class
       class=".applicationcontrol.ApplicationControl">
     <require
         permission="zope.ManageApplication"
         interface=".interfaces.IApplicationControl"/>
-  </content>
+  </class>
 
   <adapter 
       for=".interfaces.IApplicationControl"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/groupfolder.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/groupfolder.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/groupfolder.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -5,7 +5,7 @@
     xmlns:i18n="http://namespaces.zope.org/i18n"
     >
 
-  <content class=".groupfolder.GroupInformation">
+  <class class=".groupfolder.GroupInformation">
       <require
           permission="zope.ManageServices"
           interface=".groupfolder.IGroupInformation
@@ -15,16 +15,16 @@
       <implements
           interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
           />
-  </content>
+  </class>
 
-  <content class=".groupfolder.GroupFolder">
+  <class class=".groupfolder.GroupFolder">
     <implements
         interface=".groupfolder.IGroupFolder" />
     <require
         permission="zope.ManageServices"
         interface="zope.app.container.interfaces.IContainer
                  zope.app.container.interfaces.INameChooser" />
-  </content>
+  </class>
 
   <adapter
       provides="zope.app.container.interfaces.INameChooser"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/principalfolder.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/principalfolder.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/authentication/principalfolder.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -4,13 +4,13 @@
     i18n_domain="zope"
     >
 
-  <content class=".principalfolder.InternalPrincipal">
+  <class class=".principalfolder.InternalPrincipal">
     <require
         permission="zope.ManageServices"
         interface=".principalfolder.IInternalPrincipal"
         set_schema=".principalfolder.IInternalPrincipal"
         />
-  </content>
+  </class>
 
   <localUtility class=".principalfolder.PrincipalFolder">
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/broken/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/broken/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/broken/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -1,9 +1,9 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <content class=".broken.Broken">
+  <class class=".broken.Broken">
     <allow interface="zope.app.annotation.interfaces.IAnnotations" />
     <allow attributes="__module__" />
-  </content>
+  </class>
 
   <subscriber
       handler=".broken.installBroken"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/catalog/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/catalog/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/catalog/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -22,11 +22,11 @@
         />
   </localUtility>
   
-  <content class=".catalog.ResultSet">
+  <class class=".catalog.ResultSet">
     <require
         attributes="__iter__ __len__"
         permission="zope.Public"/>
-  </content>
+  </class>
   
   <subscriber
       handler=".catalog.indexAdded"
@@ -50,7 +50,7 @@
       />
   
   
-  <content class=".field.FieldIndex">
+  <class class=".field.FieldIndex">
     <require
         permission="zope.ManageServices"
         interface=".interfaces.IAttributeIndex
@@ -58,9 +58,9 @@
                   "
         set_schema=".interfaces.IAttributeIndex"
         />
-  </content>
+  </class>
   
-  <content class=".text.TextIndex">
+  <class class=".text.TextIndex">
     <require
         permission="zope.ManageServices"
         interface=".interfaces.IAttributeIndex
@@ -68,7 +68,7 @@
                   "
         set_schema=".interfaces.IAttributeIndex"
         />
-  </content>
+  </class>
   
   <include package=".browser" />
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/component/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/component/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/component/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -5,7 +5,7 @@
 
   <!-- Registration Framework -->
 
-  <content class=".registration.RegistrationManager">
+  <class class=".registration.RegistrationManager">
     <factory
         id="zope.app.component.RegistrationManager"
         title="Registration Manager" />
@@ -19,7 +19,7 @@
                    zope.app.container.interfaces.INameChooser" 
         attributes="addRegistration"
         />
-  </content>
+  </class>
 
   <!-- ++registrations++ namespace registrations -->
   <view
@@ -77,7 +77,7 @@
     <allow attributes="ISite" />
   </module>
 
-  <content class=".site.LocalSiteManager">
+  <class class=".site.LocalSiteManager">
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
     <require
@@ -87,27 +87,27 @@
         permission="zope.ManageSite"
         interface="zope.component.interfaces.ISiteManager
                    zope.app.container.interfaces.IWriteContainer" />
-  </content>
+  </class>
 
   <!-- TODO: We allow these attributes to be changed. We need some subscriber
        that updated the registries once attributes change. -->
-  <content class=".site.AdapterRegistration">
+  <class class=".site.AdapterRegistration">
     <require
         permission="zope.ManageSite"
         interface=".interfaces.IAdapterRegistration"
         set_schema=".interfaces.IAdapterRegistration"
         />
-  </content>
+  </class>
 
-  <content class=".site.UtilityRegistration">    
+  <class class=".site.UtilityRegistration">    
     <require
         permission="zope.ManageSite"
         interface=".interfaces.IUtilityRegistration"
         set_schema=".interfaces.IUtilityRegistration" 
         />
-  </content>
+  </class>
 
-  <content class=".site.SiteManagementFolder">
+  <class class=".site.SiteManagementFolder">
     <factory />
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
@@ -120,7 +120,7 @@
         interface="zope.app.container.interfaces.IWriteContainer"
         attributes="registrationManager" 
         />
-  </content>
+  </class>
   
   <adapter 
       for="zope.component.interfaces.ISiteManager"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/container/browser/ftests/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/container/browser/ftests/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/container/browser/ftests/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,12 +2,12 @@
    xmlns="http://namespaces.zope.org/zope"
    xmlns:browser="http://namespaces.zope.org/browser">
 
-  <content class=".test_contents.ReadOnlyContainer">
+  <class class=".test_contents.ReadOnlyContainer">
     <require
         permission="zope.ManageContent"
         interface="zope.app.container.interfaces.IReadContainer"
         />
-  </content>
+  </class>
 
   <browser:containerViews
       for="zope.app.container.interfaces.IReadContainer"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/container/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/container/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/container/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -63,8 +63,8 @@
       factory=".contained.ContainerSublocations"
       />
 
-  <content class=".constraints.ItemTypePrecondition">
+  <class class=".constraints.ItemTypePrecondition">
     <allow interface=".constraints.IItemTypePrecondition" />
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -29,7 +29,7 @@
 
 This is defined by HelloClass in hellomodule.
 -->
-<content class=".hellomodule.HelloClass">
+<class class=".hellomodule.HelloClass">
   <implements 
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
       />
@@ -56,7 +56,7 @@
       permission="zope.View"
       attributes="getHello"
       />
-</content>
+</class>
 
 <!--
 Create a hello.html view for Hello object.

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure_bare.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure_bare.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/hellopackage/configure_bare.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -6,7 +6,7 @@
    i18n_domain="hellopackage"
    >
 
-<content class=".hellomodule.HelloClass">
+<class class=".hellomodule.HelloClass">
   <factory
       id="hellopackage.Hello"
       title="Hello world"
@@ -16,7 +16,7 @@
       permission="zope.View"
       attributes="getHello"
       />
-</content>
+</class>
 
 <browser:page
     name="hello.html"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/itemvocabulary/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/itemvocabulary/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/itemvocabulary/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -7,19 +7,19 @@
     name="Items"
     factory=".ItemVocabulary" />
 
-<content class=".ItemVocabulary">
+<class class=".ItemVocabulary">
   <allow interface="zope.schema.interfaces.IVocabulary"/>
   <allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
-</content>
+</class>
 
-<content class=".ItemTerm">
+<class class=".ItemTerm">
   <allow interface="zope.schema.interfaces.ITokenizedTerm"/>
   <allow attributes="title"/>
-</content>
+</class>
 
 <!-- Sample Content Component and Views -->
 
-<content class=".browser.DefaultItemFolder">
+<class class=".browser.DefaultItemFolder">
   <require like_class="zope.app.content.folder.Folder"/>
 
   <require
@@ -29,7 +29,7 @@
   <require
       permission="zope.ManageContent"
       set_schema=".browser.IDefaultItem" />
-</content>
+</class>
 
 <browser:addMenuItem
     class=".browser.DefaultItemFolder"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/jobboard/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/jobboard/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/jobboard/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -5,7 +5,7 @@
     i18n_domain="jobboardi18n"
     >
 
-<content class="zope.app.demo.jobboard.job.JobList">
+<class class="zope.app.demo.jobboard.job.JobList">
   <implements interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
   />
   <factory
@@ -14,7 +14,7 @@
       />
   <allow interface=".interfaces.IJobList" />
   <implements interface="zope.app.container.interfaces.IItemContainer" />
-</content>
+</class>
 
 <browser:addMenuItem
     title="I18N Job Board"
@@ -23,9 +23,9 @@
     permission="zope.ManageContent"
     />
 
-<content class=".job.Job">
+<class class=".job.Job">
   <allow interface="zope.app.demo.jobboard.interfaces.IJob" />
-</content>
+</class>
 
 <browser:page
     name="index.html"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/passwdauth/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/passwdauth/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/passwdauth/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -3,7 +3,7 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="demo_passwdauth">
 
-<content class=".PasswdPrincipalSource">
+<class class=".PasswdPrincipalSource">
   <factory
       id="zope.app.principalsources.PasswdPrincipalSource"
       permission="zope.ManageServices"/>
@@ -11,7 +11,7 @@
   <require
       permission="zope.ManageContent"
       set_schema=".interfaces.IFileBasedPrincipalSource"/>
-</content>
+</class>
 
 <browser:addform
     schema=".interfaces.IFileBasedPrincipalSource" 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/boolwidget.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/boolwidget.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/boolwidget.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="zope">
 
-  <content class=".boolwidget.DemoBoolWidget">
+  <class class=".boolwidget.DemoBoolWidget">
 
     <require permission="zope.View" 
         interface=".interfaces.IDemoBoolWidget"
@@ -12,6 +12,6 @@
         set_schema=".interfaces.IDemoBoolWidget"
         />
 
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -4,7 +4,7 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="zope">
 
-  <content class="zope.app.demo.widget.app.DemoWidgetContainer">
+  <class class="zope.app.demo.widget.app.DemoWidgetContainer">
 
     <implements 
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -15,7 +15,7 @@
     <require permission="zope.ManageContent" 
         interface="zope.app.container.interfaces.IWriteContainer" />
 
-  </content>
+  </class>
 
   <!-- demo widgets -->
   <include file="boolwidget.zcml" />

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/intwidget.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/intwidget.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/intwidget.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="zope">
 
-  <content class=".intwidget.DemoIntWidget">
+  <class class=".intwidget.DemoIntWidget">
 
     <require permission="zope.View" 
         interface=".interfaces.IDemoIntWidget"
@@ -12,6 +12,6 @@
         set_schema=".interfaces.IDemoIntWidget"
         />
 
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textareawidget.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textareawidget.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textareawidget.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="zope">
 
-  <content class=".textareawidget.DemoTextAreaWidget">
+  <class class=".textareawidget.DemoTextAreaWidget">
 
     <require permission="zope.View" 
         interface=".interfaces.IDemoTextAreaWidget"
@@ -12,6 +12,6 @@
         set_schema=".interfaces.IDemoTextAreaWidget"
         />
 
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textwidget.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textwidget.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/demo/widget/textwidget.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="zope">
 
-  <content class=".textwidget.DemoTextWidget">
+  <class class=".textwidget.DemoTextWidget">
 
     <require permission="zope.View" 
         interface=".interfaces.IDemoTextWidget"
@@ -12,6 +12,6 @@
         set_schema=".interfaces.IDemoTextWidget"
         />
 
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/dtmlpage/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/dtmlpage/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/dtmlpage/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -9,7 +9,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".dtmlpage.DTMLPage">
+  <class class=".dtmlpage.DTMLPage">
     <factory
         id="zope.app.DTMLPage"
         title="DTML Page"
@@ -35,7 +35,7 @@
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
        />
-  </content>
+  </class>
 
   <adapter 
       for="zope.app.folder.interfaces.IFolder"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/error/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/error/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/error/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -15,7 +15,7 @@
         />
   </localUtility>
 
-  <content class=".error.RootErrorReportingUtility">
+  <class class=".error.RootErrorReportingUtility">
     <require
         permission="zope.Public"
         interface=".interfaces.IErrorReportingUtility"
@@ -24,7 +24,7 @@
         permission="zope.ManageServices"
         interface=".interfaces.ILocalErrorReportingUtility"
         />
-  </content>
+  </class>
 
   <utility
       provides=".interfaces.IErrorReportingUtility"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/externaleditor/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/externaleditor/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/externaleditor/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -13,10 +13,10 @@
       permission="zope.View"
       />
 
-  <content class="zope.app.file.File">
+  <class class="zope.app.file.File">
     <implements
         interface="zope.app.externaleditor.interfaces.IExternallyEditable"
         />
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/file/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/file/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/file/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -24,7 +24,7 @@
 
   <!-- content classes -->
 
-  <content class=".file.File">
+  <class class=".file.File">
     <factory
         id="zope.app.content.File"
         title="File"
@@ -44,9 +44,9 @@
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
        />
-  </content>
+  </class>
 
-  <content class=".image.Image">
+  <class class=".image.Image">
     <factory
         id="zope.app.content.Image"
         title="Image"
@@ -66,7 +66,7 @@
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
         />
-  </content>
+  </class>
 
   <adapter
       factory=".image.ImageSized"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/folder/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/folder/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/folder/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -8,7 +8,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".folder.Folder">
+  <class class=".folder.Folder">
     <factory
         id="zope.app.content.Folder"
         title="Folder"
@@ -29,7 +29,7 @@
         permission="zope.ManageContent"
         interface="zope.app.container.interfaces.IWriteContainer"
         />
-  </content>
+  </class>
 
   <adapter
       for=".interfaces.IFolder"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/http/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/http/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/http/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -1,8 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-<content class=".put.NullResource">
+<class class=".put.NullResource">
   <allow interface="zope.app.http.interfaces.INullResource" />
-</content>
+</class>
 
 <view
   for="zope.app.container.interfaces.ISimpleReadContainer"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -53,7 +53,7 @@
        />
 
   <!-- Setup Message Catalogs -->
-  <content class=".messagecatalog.MessageCatalog">
+  <class class=".messagecatalog.MessageCatalog">
     <factory id="zope.app.MessageCatalog" />
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -62,7 +62,7 @@
         interface="zope.i18n.interfaces.IMessageCatalog" />
     <require permission="zope.ManageSite"
         attributes="setMessage getMessageIds" />
-  </content>
+  </class>
 
 
   <!-- Setup Export and Import Filters -->

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/locales.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/locales.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/i18n/locales.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -1,57 +1,57 @@
 <configure
    xmlns="http://namespaces.zope.org/zope">
 
-  <content class="zope.i18n.format.NumberFormat">
+  <class class="zope.i18n.format.NumberFormat">
     <allow interface="zope.i18n.interfaces.INumberFormat" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.format.DateTimeFormat">
+  <class class="zope.i18n.format.DateTimeFormat">
     <allow interface="zope.i18n.interfaces.IDateTimeFormat" />
-  </content>
+  </class>
 
 
-  <content class="zope.i18n.locales.LocaleIdentity">
+  <class class="zope.i18n.locales.LocaleIdentity">
     <allow interface="zope.i18n.interfaces.locales.ILocaleIdentity" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleVersion">
+  <class class="zope.i18n.locales.LocaleVersion">
     <allow interface="zope.i18n.interfaces.locales.ILocaleVersion" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleDisplayNames">
+  <class class="zope.i18n.locales.LocaleDisplayNames">
     <allow interface="zope.i18n.interfaces.locales.ILocaleDisplayNames" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleTimeZone">
+  <class class="zope.i18n.locales.LocaleTimeZone">
     <allow interface="zope.i18n.interfaces.locales.ILocaleTimeZone" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleFormat">
+  <class class="zope.i18n.locales.LocaleFormat">
     <allow interface="zope.i18n.interfaces.locales.ILocaleFormat" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleFormatLength">
+  <class class="zope.i18n.locales.LocaleFormatLength">
     <allow interface="zope.i18n.interfaces.locales.ILocaleFormatLength" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleCalendar">
+  <class class="zope.i18n.locales.LocaleCalendar">
     <allow interface="zope.i18n.interfaces.locales.ILocaleCalendar" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleDates">
+  <class class="zope.i18n.locales.LocaleDates">
     <allow interface="zope.i18n.interfaces.locales.ILocaleDates" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleCurrency">
+  <class class="zope.i18n.locales.LocaleCurrency">
     <allow interface="zope.i18n.interfaces.locales.ILocaleCurrency" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.LocaleNumbers">
+  <class class="zope.i18n.locales.LocaleNumbers">
     <allow interface="zope.i18n.interfaces.locales.ILocaleNumbers" />
-  </content>
+  </class>
 
-  <content class="zope.i18n.locales.Locale">
+  <class class="zope.i18n.locales.Locale">
     <allow interface="zope.i18n.interfaces.locales.ILocale" />
-  </content>
+  </class>
 
 </configure>
\ No newline at end of file

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/i18nfile/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/i18nfile/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/i18nfile/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -18,7 +18,7 @@
 
   <!-- content classes -->
 
-  <content class=".i18nfile.I18nFile">
+  <class class=".i18nfile.I18nFile">
     <factory
         id="zope.app.content.I18nFile"
         title="I18n File"
@@ -43,9 +43,9 @@
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
        />
-  </content>
+  </class>
 
-  <content class=".i18nimage.I18nImage">
+  <class class=".i18nimage.I18nImage">
     <factory
         id="zope.app.content.I18nImage"
         title="I18n Image"
@@ -71,7 +71,7 @@
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
        />
-  </content>
+  </class>
 
 
   <!-- include browser package -->

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/onlinehelp/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/onlinehelp/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/onlinehelp/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -3,7 +3,7 @@
    i18n_domain="zope"
    >
 
-  <content class=".onlinehelp.OnlineHelp">
+  <class class=".onlinehelp.OnlineHelp">
     <require
         permission="zope.View"
         interface=".interfaces.ISourceTextOnlineHelpTopic"
@@ -12,34 +12,34 @@
         permission="zope.View"
         attributes="context"
         />
-  </content>
+  </class>
 
   <!-- this is the generic help topic implementation -->
-  <content class=".onlinehelptopic.OnlineHelpTopic">
+  <class class=".onlinehelptopic.OnlineHelpTopic">
     <require
         permission="zope.View"
         interface=".interfaces.ISourceTextOnlineHelpTopic"
         />
-  </content>
+  </class>
 
   <!-- explicit restructured help topic implementation -->
-  <content class=".onlinehelptopic.RESTOnlineHelpTopic">
+  <class class=".onlinehelptopic.RESTOnlineHelpTopic">
     <require
         permission="zope.View"
         interface=".interfaces.IRESTOnlineHelpTopic"
         />
-  </content>
+  </class>
 
   <!-- explicit structured help topic implementation -->
-  <content class=".onlinehelptopic.STXOnlineHelpTopic">
+  <class class=".onlinehelptopic.STXOnlineHelpTopic">
     <require
         permission="zope.View"
         interface=".interfaces.ISTXOnlineHelpTopic"
         />
-  </content>
+  </class>
 
   <!-- explicit page template help topic implementation -->
-  <content class=".onlinehelptopic.ZPTOnlineHelpTopic">
+  <class class=".onlinehelptopic.ZPTOnlineHelpTopic">
     <factory
         id="onlinehelp.topic.zpt"
         />
@@ -47,14 +47,14 @@
         permission="zope.View"
         interface=".interfaces.IZPTOnlineHelpTopic"
         />
-  </content>
+  </class>
 
-  <content class=".onlinehelptopic.OnlineHelpResource">
+  <class class=".onlinehelptopic.OnlineHelpResource">
     <require
         permission="zope.View"
         interface=".interfaces.IOnlineHelpResource"
         />
-  </content>
+  </class>
 
   <!-- Setup OnlineHelp Root as a Utility -->
   <utility

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/pagetemplate/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/pagetemplate/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/pagetemplate/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -1,8 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <content class=".viewpagetemplatefile.BoundPageTemplate">
+  <class class=".viewpagetemplatefile.BoundPageTemplate">
     <allow attributes="__call__ __str__ __name__" />
-  </content>
+  </class>
 
   <adapter
       for="*"
@@ -17,9 +17,9 @@
       factory=".urlquote.URLQuote"
       name="url"/> 
 
- <content class="zope.tales.tales.Iterator">
+ <class class="zope.tales.tales.Iterator">
     <allow interface="zope.tales.interfaces.ITALESIterator" />
- </content>
+ </class>
 
  <class class=".engine.ZopePathExpr">
     <allow attributes="__call__" />

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/pluggableauth/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/pluggableauth/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/pluggableauth/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -32,7 +32,7 @@
         handler=".PluggableAuthenticationAddSubscriber"
         />
 
-  <content class=".BTreePrincipalSource">
+  <class class=".BTreePrincipalSource">
     <factory
         id="zope.app.principalsources.BTreePrincipalSource"
         />
@@ -47,9 +47,9 @@
     <allow
         interface=".interfaces.IPrincipalSource"
         />
-  </content>
+  </class>
 
-  <content class=".SimplePrincipal">
+  <class class=".SimplePrincipal">
     <factory
         id="zope.app.principals.SimplePrincipal"
         />
@@ -60,7 +60,7 @@
         permission="zope.ManageSite"
         set_schema=".interfaces.IUserSchemafied"
         />
-  </content>
+  </class>
 
   <browser:view
       name="login"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/presentation/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/presentation/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/presentation/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -4,13 +4,13 @@
     i18n_domain="zope"
     >
 
-  <content class=".registration.PageRegistration">
+  <class class=".registration.PageRegistration">
     <require
         permission="zope.ManageSite"
         interface=".interfaces.IPageRegistration"
         set_schema=".interfaces.IPageRegistration"
         />
-  </content>
+  </class>
   
   <class class=".registration.Registered">
     <allow attributes="registrations" />
@@ -37,7 +37,7 @@
 
   <!-- Page Folder -->
 
-  <content class=".pagefolder.PageFolder">
+  <class class=".pagefolder.PageFolder">
     <factory
         id="zope.app.presentation.pagefolder.PageFolder"
         title="View Folder"
@@ -56,7 +56,7 @@
         set_schema=".interfaces.IPageFolderInfo"
         attributes="registrationManager applyDefaults" 
         />
-  </content>
+  </class>
   
   <adapter
       for=".interfaces.IPageFolder"
@@ -87,7 +87,7 @@
 
   <!-- Page Templates  -->
   
-  <content class=".zpt.ZPTTemplate">
+  <class class=".zpt.ZPTTemplate">
     <factory
         title="ZPT Template"
         description="Persistent View Page Template"
@@ -104,7 +104,7 @@
         interface=".interfaces.IZPTTemplate"
         set_schema=".interfaces.IZPTTemplate"
         />
-  </content>
+  </class>
   
   <adapter
       for=".interfaces.IZPTTemplate"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/browser/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/browser/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -14,49 +14,49 @@
 <browser:layer name="default"
   interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer" />
 
-<content class="zope.publisher.browser.BrowserRequest">
+<class class="zope.publisher.browser.BrowserRequest">
   <allow
     interface="zope.publisher.interfaces.browser.IBrowserApplicationRequest"
     attributes="response locale __str__"
     />
   <allow
     interface="zope.component.interfaces.IPresentationRequest" />
-</content>
+</class>
 
-<content class="zope.publisher.browser.TestRequest">
+<class class="zope.publisher.browser.TestRequest">
   <allow
     interface="zope.publisher.interfaces.browser.IBrowserApplicationRequest"
     attributes="response"
     />
   <allow
     interface="zope.component.interfaces.IPresentationRequest" />
-</content>
+</class>
 
-<content class="zope.publisher.browser.BrowserResponse">
+<class class="zope.publisher.browser.BrowserResponse">
   <allow
     interface="zope.publisher.interfaces.http.IHTTPResponse"
     />
-</content>
+</class>
 
-<content class="zope.app.publisher.browser.fileresource.FileResource">
+<class class="zope.app.publisher.browser.fileresource.FileResource">
   <allow interface="zope.publisher.interfaces.browser.IBrowserPublisher" />
   <allow attributes="GET HEAD __call__" />
-</content>
+</class>
 
-<content class="zope.app.publisher.browser.i18nfileresource.I18nFileResource">
+<class class="zope.app.publisher.browser.i18nfileresource.I18nFileResource">
   <allow interface="zope.publisher.interfaces.browser.IBrowserPublisher" />
   <allow attributes="GET HEAD __call__" />
-</content>
+</class>
 
-<content class=".pagetemplateresource.PageTemplateResource">
+<class class=".pagetemplateresource.PageTemplateResource">
   <allow interface="zope.publisher.interfaces.browser.IBrowserPublisher" />
   <allow attributes="__call__" />
-</content>
+</class>
 
-<content class=".directoryresource.DirectoryResource">
+<class class=".directoryresource.DirectoryResource">
   <allow interface="zope.publisher.interfaces.browser.IBrowserPublisher" />
   <allow attributes="get __getitem__" />
-</content>
+</class>
 
 <browser:page
     name=""

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/http.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/http.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/publisher/http.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,17 +2,17 @@
    xmlns="http://namespaces.zope.org/zope"
    package="zope.publisher.http">
 
-  <content class="zope.publisher.http.HTTPRequest">
+  <class class="zope.publisher.http.HTTPRequest">
     <require
         permission="zope.View"
         interface="zope.publisher.interfaces.http.IHTTPApplicationRequest"/>
-  </content>
+  </class>
 
-  <content class="zope.publisher.http.URLGetter">
+  <class class="zope.publisher.http.URLGetter">
     <require
         permission="zope.View" 
         attributes="get __getitem__ __str__" />
-  </content>
+  </class>
 
   <class class="zope.publisher.http.DirectResult">
     <allow interface="zope.publisher.http.IResult" />

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/pythonpage/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/pythonpage/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/pythonpage/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -8,7 +8,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
   
-  <content class=".PythonPage">
+  <class class=".PythonPage">
       <factory
         id="zope.app.pythonpage.PythonPage"
         title="Python Page"
@@ -25,7 +25,7 @@
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
         />
-  </content>
+  </class>
 
 
   <!-- browser directives -->

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -8,26 +8,26 @@
       title="[zope.app.rdb.Use] Use Database Connections"
       />
 
-  <content class="zope.app.rdb.ZopeConnection">
+  <class class="zope.app.rdb.ZopeConnection">
     <require
         permission="zope.ManageContent"
         interface="zope.app.rdb.interfaces.IZopeConnection"
         />
-  </content>
+  </class>
 
-  <content class="zope.app.rdb.ZopeCursor">
+  <class class="zope.app.rdb.ZopeCursor">
     <require
         permission="zope.ManageContent"
         interface="zope.app.rdb.interfaces.IZopeCursor"
         />
-  </content>
+  </class>
 
-  <content class="zope.app.rdb.Row">
+  <class class="zope.app.rdb.Row">
     <require
         permission="zope.ManageContent"
         attributes="__getattr__"
         />
-  </content>
+  </class>
 
   <localUtility class="zope.app.rdb.ZopeDatabaseAdapter">
 
@@ -37,7 +37,7 @@
 
   </localUtility>
 
-  <content class="zope.app.rdb.ResultSet">
+  <class class="zope.app.rdb.ResultSet">
     <!-- require zope.View for all list methods -->
     <require
         permission="zope.View"
@@ -50,7 +50,7 @@
         permission="zope.View"
         attributes="columns"
         />
-  </content>
+  </class>
 
   <include file="gadflyda.zcml" />
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/gadflyda.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/gadflyda.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/rdb/gadflyda.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -1,6 +1,6 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <content class="zope.app.rdb.gadflyda.GadflyAdapter">
+  <class class="zope.app.rdb.gadflyda.GadflyAdapter">
     <factory
         title="Gadfly Database Adapter" />
     <require
@@ -9,16 +9,16 @@
     <require
         permission="zope.ManageServices"
         interface="zope.app.rdb.interfaces.IZopeDatabaseAdapterManagement" />
-  </content>
+  </class>
 
-  <content class="zope.app.rdb.gadflyda.GadflyAdapterCursor">
+  <class class="zope.app.rdb.gadflyda.GadflyAdapterCursor">
     <allow
         interface="zope.app.rdb.interfaces.IZopeCursor" />
-  </content>
+  </class>
 
-  <content class="zope.app.rdb.gadflyda.GadflyAdapterConnection">
+  <class class="zope.app.rdb.gadflyda.GadflyAdapterConnection">
     <allow
         interface="zope.app.rdb.interfaces.IZopeConnection" />
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -17,12 +17,12 @@
 
   </localUtility>
 
-  <content class=".schema.SchemaRegistration">
+  <class class=".schema.SchemaRegistration">
     <require
       permission="zope.ManageServices"
       interface="zope.app.component.interfaces.IUtilityRegistration"
       set_schema="zope.app.component.interfaces.IUtilityRegistration" />
-  </content>
+  </class>
 
   <include file="fields.zcml" />
   <include package=".browser" />

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/fields.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/fields.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/fields.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -1,6 +1,6 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <content class="zope.schema.Field">
+  <class class="zope.schema.Field">
 
     <factory
         id="zope.schema.Field"
@@ -31,9 +31,9 @@
 	set_schema="zope.schema.interfaces.IField"
 	/>
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Container">
+  <class class="zope.schema.Container">
 
     <factory
         id="zope.schema.Container"
@@ -42,9 +42,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Iterable">
+  <class class="zope.schema.Iterable">
 
     <factory
         id="zope.schema.Iterable"
@@ -53,9 +53,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Orderable">
+  <class class="zope.schema.Orderable">
 
     <factory
         id="zope.schema.Orderable"
@@ -68,9 +68,9 @@
 	set_schema="zope.schema.interfaces.IMinMax"
 	/>
 
-  </content>
+  </class>
 
-  <content class="zope.schema.MinMaxLen">
+  <class class="zope.schema.MinMaxLen">
 
     <factory
         id="zope.schema.MinMaxLen"
@@ -83,9 +83,9 @@
 	set_schema="zope.schema.interfaces.IMinMaxLen"
 	/>
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Bytes">
+  <class class="zope.schema.Bytes">
 
     <factory
 	id="zope.schema.Bytes"
@@ -95,9 +95,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.BytesLine">
+  <class class="zope.schema.BytesLine">
 
     <factory
 	id="zope.schema.BytesLine"
@@ -107,9 +107,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Text">
+  <class class="zope.schema.Text">
 
     <factory
 	id="zope.schema.Text"
@@ -121,9 +121,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.TextLine">
+  <class class="zope.schema.TextLine">
 
     <factory
 	id="zope.schema.TextLine"
@@ -133,9 +133,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Bool">
+  <class class="zope.schema.Bool">
 
     <factory
 	id="zope.schema.Bool"
@@ -144,9 +144,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Int">
+  <class class="zope.schema.Int">
 
     <factory
 	id="zope.schema.Int"
@@ -156,9 +156,9 @@
     <require like_class="zope.schema.Orderable" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Float">
+  <class class="zope.schema.Float">
 
     <factory
 	id="zope.schema.Float"
@@ -168,9 +168,9 @@
     <require like_class="zope.schema.Orderable" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Tuple">
+  <class class="zope.schema.Tuple">
 
     <factory
 	id="zope.schema.Tuple"
@@ -179,9 +179,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.List">
+  <class class="zope.schema.List">
 
     <factory
 	id="zope.schema.List"
@@ -190,9 +190,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Set">
+  <class class="zope.schema.Set">
 
     <factory
 	id="zope.schema.Set"
@@ -201,9 +201,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Password">
+  <class class="zope.schema.Password">
 
     <factory
 	id="zope.schema.Password"
@@ -213,9 +213,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Dict">
+  <class class="zope.schema.Dict">
 
     <factory
 	id="zope.schema.Dict"
@@ -225,9 +225,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Datetime">
+  <class class="zope.schema.Datetime">
 
     <factory
 	id="zope.schema.Datetime"
@@ -237,9 +237,9 @@
     <require like_class="zope.schema.Orderable" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.SourceText">
+  <class class="zope.schema.SourceText">
 
     <factory
 	id="zope.schema.SourceText"
@@ -249,9 +249,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Object">
+  <class class="zope.schema.Object">
 
     <factory
 	id="zope.schema.Object"
@@ -262,9 +262,9 @@
        permission="zope.ManageContent"
        interface="zope.schema.interfaces.IObject" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.URI">
+  <class class="zope.schema.URI">
 
     <factory
 	id="zope.schema.URI"
@@ -274,9 +274,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Id">
+  <class class="zope.schema.Id">
 
     <factory
 	id="zope.schema.Id"
@@ -286,9 +286,9 @@
     <require like_class="zope.schema.MinMaxLen" />
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.InterfaceField">
+  <class class="zope.schema.InterfaceField">
 
     <factory
 	id="zope.schema.InterfaceField"
@@ -297,14 +297,14 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.vocabulary.SimpleTerm">
+  <class class="zope.schema.vocabulary.SimpleTerm">
     <allow interface="zope.schema.interfaces.ITitledTokenizedTerm" />
-  </content>
+  </class>
 
-  <content class="zope.schema.vocabulary.SimpleVocabulary">
+  <class class="zope.schema.vocabulary.SimpleVocabulary">
     <allow interface="zope.schema.interfaces.IVocabularyTokenized" />
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/tests/test_fieldfactory.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/tests/test_fieldfactory.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/schema/tests/test_fieldfactory.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -7,7 +7,7 @@
   <include package="zope.app.security" file="meta.zcml" />
   <include package="zope.app.security" file="configure.zcml" />
 
-  <content class="zope.schema.Field">
+  <class class="zope.schema.Field">
 
     <factory
 	title="Basic Field"
@@ -31,9 +31,9 @@
 	interface="zope.schema.interfaces.IField"
 	/>
 
-  </content>
+  </class>
 
-  <content class="zope.schema.Text">
+  <class class="zope.schema.Text">
 
     <factory
 	title="Text Field"
@@ -41,9 +41,9 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
-  <content class="zope.schema.TextLine">
+  <class class="zope.schema.TextLine">
 
     <factory
 	title="Text Line Field"
@@ -51,6 +51,6 @@
 
     <require like_class="zope.schema.Field" />
 
-  </content>
+  </class>
 
 </configure>
\ No newline at end of file

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/schemacontent/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/schemacontent/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/schemacontent/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -19,20 +19,20 @@
 
   </localUtility>
 
-  <content class=".content.ContentComponentDefinitionRegistration">
+  <class class=".content.ContentComponentDefinitionRegistration">
     <require
       permission="zope.ManageServices"
       interface="zope.app.component.interfaces.IUtilityRegistration"
       set_schema="zope.app.component.interfaces.IUtilityRegistration"
       />
-  </content>
+  </class>
 
 <!-- Content Component Instance -->
 
-  <content class=".content.ContentComponentInstance">
+  <class class=".content.ContentComponentInstance">
     <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-  </content>
+  </class>
 
   <include package=".browser" />
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/security/_protections.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/security/_protections.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/security/_protections.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -5,120 +5,120 @@
 
 <!-- ===================================================================== -->
 
-<content class="BTrees.IIBTree.IIBTree">
+<class class="BTrees.IIBTree.IIBTree">
    <allow attributes="__str__ __contains__ __getitem__ __iter__ __len__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKey minKey values" /> 
-</content>
-<content class="BTrees.IIBTree.IIBucket">
+</class>
+<class class="BTrees.IIBTree.IIBucket">
    <allow attributes="__contains__ __getitem__ __iter__ __len__ __str__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKeyminKey values" /> 
-</content>
-<content class="BTrees.IIBTree.IISet">
+</class>
+<class class="BTrees.IIBTree.IISet">
    <allow attributes="__contains__ __iter__ __len__ __str__ has_key insert
                       keys maxKey minKey" /> 
-</content>
-<content class="BTrees.IIBTree.IITreeIterator">
+</class>
+<class class="BTrees.IIBTree.IITreeIterator">
    <allow attributes="__iter__ __str__ __getitem__ __len__
                       __contains__ next" /> 
-</content>
+</class>
 
 <!-- ===================================================================== -->
 
-<content class="BTrees.IOBTree.IOBTree">
+<class class="BTrees.IOBTree.IOBTree">
    <allow attributes="__str__ __contains__ __getitem__ __iter__ __len__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKey minKey values" /> 
-</content>
-<content class="BTrees.IOBTree.IOBucket">
+</class>
+<class class="BTrees.IOBTree.IOBucket">
    <allow attributes="__contains__ __getitem__ __iter__ __len__ __str__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKeyminKey values" /> 
-</content>
-<content class="BTrees.IOBTree.IOSet">
+</class>
+<class class="BTrees.IOBTree.IOSet">
    <allow attributes="__contains__ __iter__ __len__ __str__ has_key insert
                       keys maxKey minKey" /> 
-</content>
-<content class="BTrees.IOBTree.IOTreeIterator">
+</class>
+<class class="BTrees.IOBTree.IOTreeIterator">
    <allow attributes="__iter__ __str__ __getitem__ __len__
                       __contains__ next" /> 
-</content>
+</class>
 
 <!-- ===================================================================== -->
 
-<content class="BTrees.OIBTree.OIBTree">
+<class class="BTrees.OIBTree.OIBTree">
    <allow attributes="__str__ __contains__ __getitem__ __iter__ __len__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKey minKey values" /> 
-</content>
-<content class="BTrees.OIBTree.OIBucket">
+</class>
+<class class="BTrees.OIBTree.OIBucket">
    <allow attributes="__contains__ __getitem__ __iter__ __len__ __str__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKeyminKey values" /> 
-</content>
-<content class="BTrees.OIBTree.OISet">
+</class>
+<class class="BTrees.OIBTree.OISet">
    <allow attributes="__contains__ __iter__ __len__ __str__ has_key insert
                       keys maxKey minKey" /> 
-</content>
-<content class="BTrees.OIBTree.OITreeIterator">
+</class>
+<class class="BTrees.OIBTree.OITreeIterator">
    <allow attributes="__iter__ __str__ __getitem__ __len__ 
                       __contains__ next" /> 
-</content>
+</class>
 
 <!-- ===================================================================== -->
 
-<content class="BTrees.OOBTree.OOBTree">
+<class class="BTrees.OOBTree.OOBTree">
    <allow attributes="__str__ __contains__ __getitem__ __iter__ __len__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKey minKey values" /> 
-</content>
-<content class="BTrees.OOBTree.OOBucket">
+</class>
+<class class="BTrees.OOBTree.OOBucket">
    <allow attributes="__contains__ __getitem__ __iter__ __len__ __str__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKeyminKey values" /> 
-</content>
-<content class="BTrees.OOBTree.OOSet">
+</class>
+<class class="BTrees.OOBTree.OOSet">
    <allow attributes="__contains__ __iter__ __len__ __str__ has_key insert
                       keys maxKey minKey" /> 
-</content>
-<content class="BTrees.OOBTree.OOTreeIterator">
+</class>
+<class class="BTrees.OOBTree.OOTreeIterator">
    <allow attributes="__iter__ __str__ __getitem__ __len__
                       __contains__ next" /> 
-</content>
+</class>
 
 <!-- ===================================================================== -->
 
-<content class="BTrees.IFBTree.IFBTree">
+<class class="BTrees.IFBTree.IFBTree">
    <allow attributes="__str__ __contains__ __getitem__ __iter__ __len__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKey minKey values" /> 
-</content>
-<content class="BTrees.IFBTree.IFBucket">
+</class>
+<class class="BTrees.IFBTree.IFBucket">
    <allow attributes="__contains__ __getitem__ __iter__ __len__ __str__
                       byValue get has_key items iteritems iterkeys
                       itervalues keys maxKeyminKey values" /> 
-</content>
-<content class="BTrees.IFBTree.IFSet">
+</class>
+<class class="BTrees.IFBTree.IFSet">
    <allow attributes="__contains__ __iter__ __len__ __str__ has_key insert
                       keys maxKey minKey" /> 
-</content>
-<content class="BTrees.IFBTree.IFTreeIterator">
+</class>
+<class class="BTrees.IFBTree.IFTreeIterator">
    <allow attributes="__iter__ __str__ __getitem__ __len__
                       __contains__ next" /> 
-</content>
+</class>
 
 <!-- ===================================================================== -->
 
-<content class="persistent.list.PersistentList">
+<class class="persistent.list.PersistentList">
    <allow attributes="__getitem__ __getslice__ __len__ __iter__
                       __contains__ index count" /> 
-</content>
-<content class="persistent.dict.PersistentDict">
+</class>
+<class class="persistent.dict.PersistentDict">
    <allow attributes="__getitem__ __len__ __iter__ get has_key
                       __copy__ keys values items iterkeys iteritems
                       itervalues __contains__" /> 
-</content>
+</class>
 
 <!-- ===================================================================== -->
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/security/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/security/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/security/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -52,18 +52,18 @@
      handler=".permission.unsetIdOnDeactivation"
      />
 
-  <content class=".permission.Permission">
+  <class class=".permission.Permission">
     <allow interface=".interfaces.IPermission" />
-  </content>
+  </class>
 
-  <content class=".principalregistry.Principal">
+  <class class=".principalregistry.Principal">
     <allow interface=".interfaces.IPrincipal" />
-  </content>
+  </class>
 
-  <content class=".settings.PermissionSetting">
+  <class class=".settings.PermissionSetting">
     <require permission="zope.Public"
              attributes="getName getDescription __str__" />
-  </content>
+  </class>
 
   <adapter factory=".NoLogout" />
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/session/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/session/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/session/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -26,45 +26,45 @@
       permission="zope.Public"
       />
 
-  <content class=".session.Session">
+  <class class=".session.Session">
     <allow interface=".interfaces.ISession" />
     <implements interface="zope.app.traversing.interfaces.IPathAdapter" />
-  </content>
+  </class>
 
-  <content class=".http.CookieClientIdManager">
+  <class class=".http.CookieClientIdManager">
     <require
         interface=".http.ICookieClientIdManager"
         permission="zope.Public" />
     <require
         set_schema=".http.ICookieClientIdManager"
         permission="zope.ManageServices" />
-  </content>
+  </class>
 
-  <content class=".session.PersistentSessionDataContainer">
+  <class class=".session.PersistentSessionDataContainer">
     <require
         interface=".interfaces.ISessionDataContainer"
         permission="zope.Public" />
     <require
         set_schema=".interfaces.ISessionDataContainer"
         permission="zope.ManageServices" />
-  </content>
+  </class>
 
-  <content class=".session.RAMSessionDataContainer">
+  <class class=".session.RAMSessionDataContainer">
     <require
         interface=".interfaces.ISessionDataContainer"
         permission="zope.Public" />
     <require
         set_schema=".interfaces.ISessionDataContainer"
         permission="zope.ManageServices" />
-  </content>
+  </class>
 
-  <content class=".session.SessionData">
+  <class class=".session.SessionData">
     <allow interface=".interfaces.ISessionData" />
-  </content>
+  </class>
 
-  <content class=".session.SessionPkgData">
+  <class class=".session.SessionPkgData">
     <allow interface=".interfaces.ISessionPkgData" />
-  </content>
+  </class>
 
   <subscriber
       for="zope.app.appsetup.IDatabaseOpenedEvent"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/sqlscript/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/sqlscript/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/sqlscript/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -18,7 +18,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".sqlscript.SQLScript">
+  <class class=".sqlscript.SQLScript">
     <factory
         id="zope.app.content.SQLScript"
         title="SQL Script"
@@ -32,23 +32,23 @@
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
         />
-  </content>
+  </class>
 
 
   <!-- Arguments Directives -->
-  <content class=".sqlscript.Arguments">
+  <class class=".sqlscript.Arguments">
     <require
         permission="zope.ManageContent"
         interface="zope.interface.common.mapping.IEnumerableMapping"
         />
-  </content>
+  </class>
 
   <!-- SQL DTML Directives -->
-  <content class=".dtml.SQLDTML">
+  <class class=".dtml.SQLDTML">
     <require
         permission="zope.ManageContent"
         attributes="__call__" />
-  </content>
+  </class>
 
 
   <!-- include browser package -->

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/undo/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/undo/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/undo/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -25,7 +25,7 @@
       />
 
 
-  <content class="zope.app.undo.ZODBUndoManager">
+  <class class="zope.app.undo.ZODBUndoManager">
     <require
         permission="zope.UndoOwnTransactions"
         interface="zope.app.undo.interfaces.IPrincipalUndo"
@@ -34,7 +34,7 @@
         permission="zope.UndoAllTransactions"
         interface="zope.app.undo.interfaces.IUndo"
         />
-  </content>
+  </class>
 
   <!-- Browser directives -->
 

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -44,18 +44,18 @@
       name="ProcessDefinitions"
       />
 
-  <content class=".definition.ProcessDefinitionVocabulary">
+  <class class=".definition.ProcessDefinitionVocabulary">
       <allow interface="zope.schema.interfaces.IVocabularyTokenized"/>
-  </content>
+  </class>
 
-  <content class=".definition.ProcessDefinitionTerm">
+  <class class=".definition.ProcessDefinitionTerm">
       <allow interface="zope.schema.interfaces.ITokenizedTerm"/>
-  </content>
+  </class>
 
 
   <!-- Process Instance Container -->
 
-  <content 
+  <class 
         class="zope.app.workflow.definition.ProcessDefinitionElementContainer">
 
     <implements
@@ -71,7 +71,7 @@
         permission="zope.workflow.ManageProcessDefinitions"
         interface="zope.app.container.interfaces.IWriteContainer"
         />
-  </content>
+  </class>
 
   <adapter
       factory="zope.app.workflow.instance.ProcessInstanceContainerAdapter"

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -2,7 +2,7 @@
 
 <!-- Stateful ProcessDefintion -->
 
-<content
+<class
     class=".definition.StatefulProcessDefinition">
   <factory
       id="zope.app.workflow.StatefulProcessDefinition"
@@ -22,12 +22,12 @@
       permission="zope.workflow.ManageProcessDefinitions"
       interface="zope.app.container.interfaces.IReadContainer"
       />
-</content>
+</class>
 
 
 <!-- States Container -->
 
-<content class=".definition.StatesContainer">
+<class class=".definition.StatesContainer">
   <factory
       id="zope.app.workflow.StatefulStatesContainer"
       />
@@ -38,11 +38,11 @@
   <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
       />
-</content>
+</class>
 
 <!-- State -->
 
-<content class=".definition.State">
+<class class=".definition.State">
   <factory
       id="zope.app.workflow.StatefulState"
       />
@@ -54,7 +54,7 @@
   <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
       />
-</content>
+</class>
 
 <utility
     component=".definition.StateNamesVocabulary"
@@ -63,7 +63,7 @@
 
 <!-- Transitions Container -->
 
-<content class=".definition.TransitionsContainer">
+<class class=".definition.TransitionsContainer">
   <factory
       id="zope.app.workflow.StatefulTransitionsContainer"
       />
@@ -74,11 +74,11 @@
   <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
       />
-</content>
+</class>
 
 <!-- Transition -->
 
-<content class=".definition.Transition">
+<class class=".definition.Transition">
   <factory
       id="zope.app.workflow.StatefulTransition"
       />
@@ -90,11 +90,11 @@
   <implements
       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
       />
-</content>
+</class>
 
 <!-- ContentWorkflowsManager -->
 
-<content
+<class
     class=".contentworkflow.ContentWorkflowsManager">
   <factory
     id="zope.app.workflow.ContentWorkflowsManager"
@@ -112,7 +112,7 @@
     interface=".interfaces.IContentWorkflowsManager"
     attributes="cpRegistry"
     />
-</content>
+</class>
 
 <class class=".instance.StatefulProcessInstance">
   <require

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/testobject.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/testobject.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/workflow/stateful/testobject.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -3,7 +3,7 @@
 
   <interface interface=".testobject.IWorkflowData"/>
 
-  <content class=".testobject.TestObject">
+  <class class=".testobject.TestObject">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"/>
@@ -21,6 +21,6 @@
         interface=".testobject.ITestObject"
         set_schema=".testobject.ITestObject" />
 
-  </content>
+  </class>
 
 </configure>

Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/zptpage/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/zptpage/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/zptpage/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -8,7 +8,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".zptpage.ZPTPage">
+  <class class=".zptpage.ZPTPage">
     <factory
         id="zope.app.content.ZPTPage"
         title="ZPT Page"
@@ -30,7 +30,7 @@
     <implements
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
         />
-  </content>
+  </class>
 
   <adapter 
       for="zope.app.folder.interfaces.IFolder"

Modified: Zope3/branches/philikon-reduce-zcml/src/zwiki/configure.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zwiki/configure.zcml	2006-03-15 23:40:36 UTC (rev 66052)
+++ Zope3/branches/philikon-reduce-zcml/src/zwiki/configure.zcml	2006-03-15 23:58:58 UTC (rev 66053)
@@ -86,7 +86,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".wiki.Wiki">
+  <class class=".wiki.Wiki">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -112,7 +112,7 @@
         permission="zwiki.AddWikiPage"
         interface="zope.app.container.interfaces.IWriteContainer"/>
 
-  </content>
+  </class>
 
   <!-- Mail Subscriptions support -->
   <adapter
@@ -141,7 +141,7 @@
       type="zope.app.content.interfaces.IContentType"
       /> 
 
-  <content class=".wikipage.WikiPage">
+  <class class=".wikipage.WikiPage">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -158,7 +158,7 @@
         permission="zwiki.AddWikiPage"
         set_schema=".interfaces.IWikiPage" />
 
-  </content>
+  </class>
 
   <adapter
       factory=".wikipage.WikiPageHierarchyAdapter"
@@ -186,7 +186,7 @@
       type="zope.app.content.interfaces.IContentType"
       />
 
-  <content class=".comment.Comment">
+  <class class=".comment.Comment">
 
     <implements
        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -202,7 +202,7 @@
         permission="zwiki.CommentWikiPage"
         set_schema=".interfaces.IComment" />
 
-  </content>
+  </class>
 
   <adapter
      for=".interfaces.IComment"



More information about the Zope3-Checkins mailing list