[Zope3-checkins] CVS: ZODB3/ZConfig/tests/input - simplesections.xml:1.1.24.1 base.xml:1.1.24.1 base-keytype2.xml:1.1.24.1 base-keytype1.xml:1.1.24.1 base-datatype2.xml:1.1.24.1 base-datatype1.xml:1.1.24.1 simplesections.conf:1.1.144.1 simple.xml:1.2.88.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZConfig/tests/input
In directory cvs.zope.org:/tmp/cvs-serv26665/ZConfig/tests/input

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	simplesections.conf simple.xml 
Added Files:
      Tag: ZODB3-mvcc-2-branch
	simplesections.xml base.xml base-keytype2.xml 
	base-keytype1.xml base-datatype2.xml base-datatype1.xml 
Log Message:
Merge the head to the mvcc branch.

This merge should be the final preparation for merging the branch to
the trunk.


=== Added File ZODB3/ZConfig/tests/input/simplesections.xml ===
<schema>
  <sectiontype name="section">
    <key name="var" />
    <key name="var-one" />
    <key name="var-two" />
    <key name="var-three" />
  </sectiontype>
  <sectiontype name="minimal" />
  <sectiontype name="trivial">
    <key name="var" />
  </sectiontype>

  <multisection type="section" name="*" attribute="sections" />
  <section type="minimal" name="*" attribute="minimal" />
  <section type="trivial" name="*" attribute="trivial" />

  <key name="var" />
  <key name="var-0" />
  <key name="var-1" />
  <key name="var-2" />
  <key name="var-3" />
  <key name="var-4" />
  <key name="var-5" />
  <key name="var-6" />
</schema>


=== Added File ZODB3/ZConfig/tests/input/base.xml ===
<schema>
  <sectiontype name="type-X"/>
</schema>


=== Added File ZODB3/ZConfig/tests/input/base-keytype2.xml ===
<schema keytype="ZConfig.tests.test_schema.uppercase">
  <sectiontype name="type-2"/>
</schema>


=== Added File ZODB3/ZConfig/tests/input/base-keytype1.xml ===
<schema keytype="basic-key">
  <sectiontype name="type-1"/>
</schema>


=== Added File ZODB3/ZConfig/tests/input/base-datatype2.xml ===
<schema datatype="ZConfig.tests.test_schema.appsection">
  <sectiontype name="type-2"/>
</schema>


=== Added File ZODB3/ZConfig/tests/input/base-datatype1.xml ===
<schema datatype="ZConfig.tests.test_schema.MySection">
  <sectiontype name="type-1"/>
</schema>



=== ZODB3/ZConfig/tests/input/simplesections.conf 1.1 => 1.1.144.1 ===
--- ZODB3/ZConfig/tests/input/simplesections.conf:1.1	Tue Oct  8 17:42:17 2002
+++ ZODB3/ZConfig/tests/input/simplesections.conf	Tue Dec 23 14:06:00 2003
@@ -1,7 +1,7 @@
 var foo
 var-0 foo-0
 
-<section name (delegate)>
+<section name>
   var bar
   var-one  splat
 </section>
@@ -22,8 +22,8 @@
 
 var-3 foo-3
 
-# An anonymous empty section that delegates:
-<section (delegate) />
+# An anonymous empty section:
+<section />
 
 var-4 foo-4
 


=== ZODB3/ZConfig/tests/input/simple.xml 1.2 => 1.2.88.1 ===
--- ZODB3/ZConfig/tests/input/simple.xml:1.2	Fri Jan  3 16:05:59 2003
+++ ZODB3/ZConfig/tests/input/simple.xml	Tue Dec 23 14:06:00 2003
@@ -17,8 +17,13 @@
   <key name="false-var-2" datatype="boolean" />
   <key name="false-var-3" datatype="boolean" />
 
-  <key name="list-1" />
-  <key name="list-2" />
-  <key name="list-3" />
-  <key name="list-4" />
+  <key name="list-1" datatype="string-list" />
+  <key name="list-2" datatype="string-list" />
+  <key name="list-3" datatype="string-list" />
+  <key name="list-4" datatype="string-list" />
+
+  <!-- added by include.conf -->
+  <key name="var2" />
+  <key name="var3" />
+  <key name="var4" />
 </schema>