[Zope-CVS] CVS: Products/Ape/lib/apelib/zope2 - apeconf.xml:1.1.2.4

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/zope2
In directory cvs.zope.org:/tmp/cvs-serv9330/zope2

Modified Files:
      Tag: ape-newconf-branch
	apeconf.xml 
Log Message:
Renamed variant to variation, a simpler word that makes more sense

=== Products/Ape/lib/apelib/zope2/apeconf.xml 1.1.2.3 => 1.1.2.4 ===
--- Products/Ape/lib/apelib/zope2/apeconf.xml:1.1.2.3	Tue Jul  8 22:10:46 2003
+++ Products/Ape/lib/apelib/zope2/apeconf.xml	Wed Jul  9 08:46:58 2003
@@ -10,22 +10,22 @@
  <serializer name="root_items"
    factory="apelib.zodb3.serializers.BasicPersistentMapping" />
  <serializer name="roll_call" factory="apelib.zodb3.serializers.RollCall" />
- <variant name="filesystem">
+ <variation name="filesystem">
   <classifier factory="apelib.zope2.classifier.Classifier">
    <gateway factory="apelib.fs.classification.FSClassificationSection" />
   </classifier>
   <keygen factory="apelib.core.keygen.PathKeychainGenerator" />
   <gateway name="root_items" factory="apelib.zope2.ofsserial.ReadOnlyRoot"
     param="/" />
- </variant>
- <variant name="sql">
+ </variation>
+ <variation name="sql">
   <classifier factory="apelib.zope2.classifier.Classifier">
    <gateway factory="apelib.sql.classification.SQLClassification" />
   </classifier>
   <keygen factory="apelib.sql.keygen.SQLKeychainGenerator" />
   <gateway name="root_items" factory="apelib.zope2.ofsserial.ReadOnlyRoot"
     param="0" />
- </variant>
+ </variation>
 </mapper>
 
 <!-- Abstract mappers -->
@@ -39,30 +39,30 @@
    factory="apelib.zope2.security.SecurityAttributes" />
  <serializer name="remainder" order="z"
    factory="apelib.zodb3.serializers.RemainingState" />
- <variant name="filesystem">
+ <variation name="filesystem">
   <gateway name="id" factory="apelib.fs.structure.FSAutoId" />
   <gateway name="modtime" factory="apelib.fs.structure.FSModTime" />
   <gateway name="remainder" factory="apelib.fs.properties.FSSectionData"
     param="remainder" />
   <gateway name="security" factory="apelib.fs.security.FSSecurityAttributes" />
- </variant>
- <variant name="sql">
+ </variation>
+ <variation name="sql">
   <gateway name="id" use="sql_id" />
   <gateway name="modtime" use="sql_modtime" />
   <gateway name="remainder" use="sql_remainder" />
   <gateway name="security" use="sql_security" />
- </variant>
+ </variation>
 </mapper>
 
 <mapper name="base_p" class="none" extends="base">
  <serializer name="properties"
    factory="apelib.zope2.ofsserial.OFSProperties" />
- <variant name="filesystem">
+ <variation name="filesystem">
   <gateway name="properties" factory="apelib.fs.properties.FSProperties" />
- </variant>
- <variant name="sql">
+ </variation>
+ <variation name="sql">
   <gateway name="properties" use="sql_properties" />
- </variant>
+ </variation>
 </mapper>
 
 <!-- Reusable serializers and gateways -->
@@ -72,15 +72,15 @@
 <serializer name="optional_properties"
   factory="apelib.zope2.ofsserial.OptionalOFSProperties" />
 
-<variant name="filesystem">
+<variation name="filesystem">
  <gateway name="binary_data" factory="apelib.fs.structure.FSFileData"
    param="binary" />
  <gateway name="text_data" factory="apelib.fs.structure.FSFileData"
    param="text" />
  <gateway name="dir_items" factory="apelib.fs.structure.FSDirectoryItems" />
-</variant>
+</variation>
 
-<variant name="sql">
+<variation name="sql">
  <gateway name="binary_data" factory="apelib.sql.structure.SQLObjectData" />
  <gateway name="text_data" use="binary_data" />
  <gateway name="dir_items" factory="apelib.sql.structure.SQLFolderItems" />
@@ -91,7 +91,7 @@
  <gateway name="sql_security"
    factory="apelib.sql.security.SQLSecurityAttributes" />
  <gateway name="sql_userlist" factory="apelib.sql.security.SQLUserList" />
-</variant>
+</variation>
 
 <!-- Mappers for particular content types -->
 
@@ -140,13 +140,13 @@
    factory="apelib.zope2.scripts.ZSQLMethodSerializer" />
  <gateway name="text" use="text_data" />
  <use-for extensions=".sql" />
- <variant name="filesystem">
+ <variation name="filesystem">
   <gateway name="properties" factory="apelib.fs.properties.FSProperties"
     param="ZSQL Properties" />
- </variant>
- <variant name="sql">
+ </variation>
+ <variation name="sql">
   <gateway name="properties" use="sql_properties" />
- </variant>
+ </variation>
 </mapper>
 
 <mapper name="Products.PythonScripts.PythonScript.PythonScript"
@@ -160,12 +160,12 @@
 <mapper name="AccessControl.User.UserFolder" extends="base" parent="root">
  <serializer name="data"
    factory="apelib.zope2.security.UserFolderSerializer" />
- <variant name="filesystem">
+ <variation name="filesystem">
   <gateway name="data" factory="apelib.fs.security.FSUserList" />
- </variant>
- <variant name="sql">
+ </variation>
+ <variation name="sql">
   <gateway name="data" use="sql_userlist" />
- </variant>
+ </variation>
 </mapper>
 
 <mapper name="anyfolder" class="any" extends="base_p" parent="root">
@@ -186,12 +186,12 @@
  <serializer name="id" enabled="false" />
  <gateway name="id" enabled="false" />
  <gateway name="items" use="dir_items" />
- <variant name="filesystem">
+ <variation name="filesystem">
   <use-for key="/" />
- </variant>
- <variant name="sql">
+ </variation>
+ <variation name="sql">
   <use-for key="0" />
- </variant>
+ </variation>
 </mapper>
 
 <mapper name="anyfile">