db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r225384 [2/6] - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Date Tue, 26 Jul 2005 20:18:03 GMT
Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -54,7 +54,9 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfString10" column="HASHSET_OF_STRING10">
+            <field name="HashSetOfString10"
+                   column="HASHSET_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="HashSetOfString11" table="HASHSET_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -66,7 +68,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfDate13" column="HASHSET_OF_DATE13">
+            <field name="HashSetOfDate13" column="HASHSET_OF_DATE13"
+            serialized="true">
             </field>
             <field name="HashSetOfDate14" table="HASHSET_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -78,7 +81,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfLocale16" column="HASHSET_OF_LOCALE16">
+            <field name="HashSetOfLocale16" column="HASHSET_OF_LOCALE16"
+            serialized="true">
             </field>
             <field name="HashSetOfLocale17" table="HASHSET_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -90,7 +94,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigDecimal19" column="HASHSET_OF_BIG_DECIMAL18">
+            <field name="HashSetOfBigDecimal19" column="HASHSET_OF_BIG_DECIMAL19"
+            serialized="true">
             </field>
             <field name="HashSetOfBigDecimal20" table="HASHSET_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -102,7 +107,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22">
+            <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22"
+            serialized="true">
             </field>
             <field name="HashSetOfBigInteger23" table="HASHSET_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -114,9 +120,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfByte25" column="HASHSET_OF_BYTE25">
+            <field name="HashSetOfByte25" column="HASHSET_OF_BYTE25"
+            serialized="true">
             </field>
-            <field name="HashSetOfByte26" table="HASHSET_OF_BYTE27">
+            <field name="HashSetOfByte26" table="HASHSET_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
@@ -126,7 +133,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfDouble28" column="HASHSET_OF_DOUBLE28">
+            <field name="HashSetOfDouble28" column="HASHSET_OF_DOUBLE28"
+            serialized="true">
             </field>
             <field name="HashSetOfDouble29" table="HASHSET_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -138,7 +146,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfFloat31" column="HASHSET_OF_FLOAT31">
+            <field name="HashSetOfFloat31" column="HASHSET_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="HashSetOfFloat32" table="HASHSET_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -150,7 +159,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfInteger34" column="HASHSET_OF_INTEGER34">
+            <field name="HashSetOfInteger34" column="HASHSET_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="HashSetOfInteger35" table="HASHSET_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -162,7 +172,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfLong37" column="HASHSET_OF_LONG37">
+            <field name="HashSetOfLong37" column="HASHSET_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="HashSetOfLong38" table="HASHSET_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -174,7 +185,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40">
+            <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="HashSetOfShort41" table="HASHSET_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -4,319 +4,391 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections" table="HASHTABLESTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="HashtableOfString_Object0" table="HASHTBL_OF_STR_OBJECT0">
+            <field name="HashtableOfString_Object0" table="HASHTBL_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Object1" table="HASHTBL_OF_STR_OBJECT1">
+            <field name="HashtableOfString_Object1" table="HASHTBL_STR_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Object2" table="HASHTBL_OF_STR_OBJECT2">
+            <field name="HashtableOfString_Object2" table="HASHTBL_STR_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass3" table="HASHTBL_OF_STR_SIMPLE_CLASS3">
+            <field name="HashtableOfString_SimpleClass3" table="HASHTBL_STR_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass4" table="HASHTBL_OF_STR_SIMPLE_CLASS4">
+            <field name="HashtableOfString_SimpleClass4" table="HASHTBL_STR_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass5" table="HASHTBL_OF_STR_SIMPLE_CLASS5">
+            <field name="HashtableOfString_SimpleClass5" table="HASHTBL_STR_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface6" table="HASHTBL_OF_STR_SIMPLE_INTERFACE6">
+            <field name="HashtableOfString_SimpleInterface6" table="HASHTBL_STR_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface7" column="HASHTBL_STR_SIMPLE_INTERFACE7">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface8" column="HASHTBL_STR_SIMPLE_INTERFACE8">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_String9" column="HASHTBL_STR_STRING9">
+            <field name="HashtableOfString_String9" column="HASHTBL_STR_STRING9"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String10" column="HASHTBL_STR_STRING10">
+            <field name="HashtableOfString_String10" column="HASHTBL_STR_STRING10"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String11" column="HASHTBL_STR_STRING11">
+            <field name="HashtableOfString_String11" column="HASHTBL_STR_STRING11"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Date12" column="HASHTBL_STR_DATE12">
+            <field name="HashtableOfString_Date12" column="HASHTBL_STR_DATE12"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Date13" column="HASHTBL_STR_DATE13">
+            <field name="HashtableOfString_Date13" column="HASHTBL_STR_DATE13"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Date14" column="HASHTBL_STR_DATE14">
+            <field name="HashtableOfString_Date14" column="HASHTBL_STR_DATE14"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Locale15" column="HASHTBL_STR_LOCALE15">
+            <field name="HashtableOfString_Locale15" column="HASHTBL_STR_LOCALE15"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Locale16" column="HASHTBL_STR_LOCALE16">
+            <field name="HashtableOfString_Locale16" column="HASHTBL_STR_LOCALE16"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Locale17" column="HASHTBL_STR_LOCALE17">
+            <field name="HashtableOfString_Locale17" column="HASHTBL_STR_LOCALE17"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigDecimal18" column="HASHTBL_STR_BIG_DECIMAL18">
+            <field name="HashtableOfString_BigDecimal18" column="HASHTBL_STR_BIG_DECIMAL18"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigDecimal19" column="HASHTBL_STR_BIG_DECIMAL19">
+            <field name="HashtableOfString_BigDecimal19" column="HASHTBL_STR_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigDecimal20" column="HASHTBL_STR_BIG_DECIMAL20">
+            <field name="HashtableOfString_BigDecimal20" column="HASHTBL_STR_BIG_DECIMAL20"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigInteger21" column="HASHTBL_STR_BIG_INTEGER21">
+            <field name="HashtableOfString_BigInteger21" column="HASHTBL_STR_BIG_INTEGER21"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigInteger22" column="HASHTBL_STR_BIG_INTEGER22">
+            <field name="HashtableOfString_BigInteger22" column="HASHTBL_STR_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigInteger23" column="HASHTBL_STR_BIG_INTEGER23">
+            <field name="HashtableOfString_BigInteger23" column="HASHTBL_STR_BIG_INTEGER23"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Byte24" column="HASHTBL_STR_BYTE24">
+            <field name="HashtableOfString_Byte24" column="HASHTBL_STR_BYTE24"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Byte25" column="HASHTBL_STR_BYTE25">
+            <field name="HashtableOfString_Byte25" column="HASHTBL_STR_BYTE25"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Byte26" column="HASHTBL_STR_BYTE27">
+            <field name="HashtableOfString_Byte26" column="HASHTBL_STR_BYTE26"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Double27" column="HASHTBL_STR_DOUBLE27">
+            <field name="HashtableOfString_Double27" column="HASHTBL_STR_DOUBLE27"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Double28" column="HASHTBL_STR_DOUBLE28">
+            <field name="HashtableOfString_Double28" column="HASHTBL_STR_DOUBLE28"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Double29" column="HASHTBL_STR_DOUBLE29">
+            <field name="HashtableOfString_Double29" column="HASHTBL_STR_DOUBLE29"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Float30" column="HASHTBL_STR_FLOAT30">
+            <field name="HashtableOfString_Float30" column="HASHTBL_STR_FLOAT30"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Float31" column="HASHTBL_STR_FLOAT31">
+            <field name="HashtableOfString_Float31" column="HASHTBL_STR_FLOAT31"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Float32" column="HASHTBL_STR_FLOAT32">
+            <field name="HashtableOfString_Float32" column="HASHTBL_STR_FLOAT32"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Integer33" column="HASHTBL_STR_INTEGER33">
+            <field name="HashtableOfString_Integer33" column="HASHTBL_STR_INTEGER33"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Integer34" column="HASHTBL_STR_INTEGER34">
+            <field name="HashtableOfString_Integer34" column="HASHTBL_STR_INTEGER34"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Integer35" column="HASHTBL_STR_INTEGER35">
+            <field name="HashtableOfString_Integer35" column="HASHTBL_STR_INTEGER35"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Long36" column="HASHTBL_STR_LONG36">
+            <field name="HashtableOfString_Long36" column="HASHTBL_STR_LONG36"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Long37" column="HASHTBL_STR_LONG37">
+            <field name="HashtableOfString_Long37" column="HASHTBL_STR_LONG37"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Long38" column="HASHTBL_STR_LONG38">
+            <field name="HashtableOfString_Long38" column="HASHTBL_STR_LONG38"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Short39" column="HASHTBL_STR_SHORT39">
+            <field name="HashtableOfString_Short39" column="HASHTBL_STR_SHORT39"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Short40" column="HASHTBL_STR_SHORT40">
+            <field name="HashtableOfString_Short40" column="HASHTBL_STR_SHORT40"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Short41" column="HASHTBL_STR_SHORT41">
+            <field name="HashtableOfString_Short41" column="HASHTBL_STR_SHORT41"
+                   serialized="true">
             </field>
-  <field name="HashtableOfString_Object42" table="HASHTBL_OF_STR_OBJECT42">
+  <field name="HashtableOfString_Object42" table="HASHTBL_STR_OBJECT42">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Object43" table="HASHTBL_OF_STR_OBJECT43">
+            <field name="HashtableOfString_Object43" table="HASHTBL_STR_OBJECT43">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass45" table="HASHTBL_OF_STR_SIMPLE_CLASS45">
+            <field name="HashtableOfString_SimpleClass45" table="HASHTBL_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass46" table="HASHTBL_OF_STR_SIMPLE_CLASS46">
+            <field name="HashtableOfString_SimpleClass46" table="HASHTBL_STR_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface48" table="HASHTBL_OF_STR_SIMPLE_INTERFACE48">
+            <field name="HashtableOfString_SimpleInterface48" table="HASHTBL_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface49" table="HASHTBL_OF_STR_SIMPLE_INTERFACE49">
+            <field name="HashtableOfString_SimpleInterface49" table="HASHTBL_STR_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_String51" column="HASHTBL_STR_STRING51">
+            <field name="HashtableOfString_String51" column="HASHTBL_STR_STRING51"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String52" column="HASHTBL_STR_STRING52">
+            <field name="HashtableOfString_String52" column="HASHTBL_STR_STRING52"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Date54" column="HASHTBL_STR_DATE54">
+            <field name="HashtableOfString_Date54" column="HASHTBL_STR_DATE54"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Date55" column="HASHTBL_STR_DATE55">
+            <field name="HashtableOfString_Date55" column="HASHTBL_STR_DATE55"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Locale57" column="HASHTBL_STR_LOCALE57">
+            <field name="HashtableOfString_Locale57" column="HASHTBL_STR_LOCALE57"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Locale58" column="HASHTBL_STR_LOCALE58">
+            <field name="HashtableOfString_Locale58" column="HASHTBL_STR_LOCALE58"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigDecimal60" column="HASHTBL_STR_BIG_DECIMAL60">
+            <field name="HashtableOfString_BigDecimal60" column="HASHTBL_STR_BIG_DECIMAL60"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigDecimal61" column="HASHTBL_STR_BIG_DECIMAL61">
+            <field name="HashtableOfString_BigDecimal61" column="HASHTBL_STR_BIG_DECIMAL61"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigInteger63" column="HASHTBL_STR_BIG_INTEGER63">
+            <field name="HashtableOfString_BigInteger63" column="HASHTBL_STR_BIG_INTEGER63"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigInteger64" column="HASHTBL_STR_BIG_INTEGER64">
+            <field name="HashtableOfString_BigInteger64" column="HASHTBL_STR_BIG_INTEGER64"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Byte66" column="HASHTBL_STR_BYTE66">
+            <field name="HashtableOfString_Byte66" column="HASHTBL_STR_BYTE66"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Byte67" column="HASHTBL_STR_BYTE67">
+            <field name="HashtableOfString_Byte67" column="HASHTBL_STR_BYTE67"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Double69" column="HASHTBL_STR_DOUBLE69">
+            <field name="HashtableOfString_Double69" column="HASHTBL_STR_DOUBLE69"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Double70" column="HASHTBL_STR_DOUBLE70">
+            <field name="HashtableOfString_Double70" column="HASHTBL_STR_DOUBLE70"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Float72" column="HASHTBL_STR_FLOAT72">
+            <field name="HashtableOfString_Float72" column="HASHTBL_STR_FLOAT72"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Float73" column="HASHTBL_STR_FLOAT73">
+            <field name="HashtableOfString_Float73" column="HASHTBL_STR_FLOAT73"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Integer75" column="HASHTBL_STR_INTEGER75">
+            <field name="HashtableOfString_Integer75" column="HASHTBL_STR_INTEGER75"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Integer76" column="HASHTBL_STR_INTEGER76">
+            <field name="HashtableOfString_Integer76" column="HASHTBL_STR_INTEGER76"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Long78" column="HASHTBL_STR_LONG78">
+            <field name="HashtableOfString_Long78" column="HASHTBL_STR_LONG78"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Long79" column="HASHTBL_STR_LONG79">
+            <field name="HashtableOfString_Long79" column="HASHTBL_STR_LONG79"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Short81" column="HASHTBL_STR_SHORT81">
+            <field name="HashtableOfString_Short81" column="HASHTBL_STR_SHORT81"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Short82" column="HASHTBL_STR_SHORT82">
+            <field name="HashtableOfString_Short82" column="HASHTBL_STR_SHORT82"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Object84" table="HASHTBL_OF_STR_OBJECT84">
+            <field name="HashtableOfString_Object84" table="HASHTBL_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Object86" table="HASHTBL_OF_STR_OBJECT86">
+            <field name="HashtableOfString_Object86" table="HASHTBL_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass87" table="HASHTBL_OF_STR_SIMPLE_CLASS87">
+            <field name="HashtableOfString_SimpleClass87" table="HASHTBL_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass89" table="HASHTBL_OF_STR_SIMPLE_CLASS89">
+            <field name="HashtableOfString_SimpleClass89" table="HASHTBL_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface90" table="HASHTBL_OF_STR_SIMPLE_INTERFACE90">
+            <field name="HashtableOfString_SimpleInterface90" table="HASHTBL_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface92" table="HASHTBL_OF_STR_SIMPLE_INTERFACE92">
+            <field name="HashtableOfString_SimpleInterface92" table="HASHTBL_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_String93" column="HASHTBL_STR_STRING93">
+            <field name="HashtableOfString_String93" column="HASHTBL_STR_STRING93"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String95" table="HASHTBL_OF_STR_STRING95">
+            <field name="HashtableOfString_String95" table="HASHTBL_STR_STRING95">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
+                <key column="KEYVAL"/>
+                <value column="KEYVALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Date96" column="HASHTBL_STR_DATE96">
+            <field name="HashtableOfString_Date96" column="HASHTBL_STR_DATE96"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Date98" table="HASHTBL_OF_STR_DATE98">
+            <field name="HashtableOfString_Date98" table="HASHTBL_STR_DATE98">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Locale99" column="HASHTBL_STR_LOCALE99">
+            <field name="HashtableOfString_Locale99" column="HASHTBL_STR_LOCALE99"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Locale101" table="HASHTBL_OF_STR_LOCALE101">
+            <field name="HashtableOfString_Locale101" table="HASHTBL_STR_LOCALE101">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_BigDecimal102" column="HASHTBL_STR_BIG_DECIMAL102">
+            <field name="HashtableOfString_BigDecimal102" column="HASHTBL_STR_BIG_DECIMAL102"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_BigDecimal104" table="HASHTBL_OF_STR_BIG_DECIMAL104">
+            <field name="HashtableOfString_BigDecimal104" table="HASHTBL_STR_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_BigInteger105" column="HASHTBL_STR_BIG_INTEGER105">
             </field>
-            <field name="HashtableOfString_BigInteger107" table="HASHTBL_OF_STR_BIG_INTEGER107">
+            <field name="HashtableOfString_BigInteger107" table="HASHTBL_STR_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Byte108" column="HASHTBL_STR_BYTE108">
             </field>
-            <field name="HashtableOfString_Byte110" table="HASHTBL_OF_STR_BYTE110">
+            <field name="HashtableOfString_Byte110" table="HASHTBL_STR_BYTE110">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Double111" column="HASHTBL_STR_DOUBLE111">
+            <field name="HashtableOfString_Double111" column="HASHTBL_STR_DOUBLE111"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Double113" table="HASHTBL_OF_STR_DOUBLE113">
+            <field name="HashtableOfString_Double113" table="HASHTBL_STR_DOUBLE113">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Float114" column="HASHTBL_STR_FLOAT114">
+            <field name="HashtableOfString_Float114" column="HASHTBL_STR_FLOAT114"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Float116" table="HASHTBL_OF_STR_FLOAT116">
+            <field name="HashtableOfString_Float116" table="HASHTBL_STR_FLOAT116">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Integer117" column="HASHTBL_STR_INTEGER117">
+            <field name="HashtableOfString_Integer117" column="HASHTBL_STR_INTEGER117"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Integer119" table="HASHTBL_OF_STR_INTEGER119">
+            <field name="HashtableOfString_Integer119" table="HASHTBL_STR_INTEGER119">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Long120" column="HASHTBL_STR_LONG120">
+            <field name="HashtableOfString_Long120" column="HASHTBL_STR_LONG120"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Long122" table="HASHTBL_OF_STR_LONG122">
+            <field name="HashtableOfString_Long122" table="HASHTBL_STR_LONG122">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Short123" column="HASHTBL_STR_SHORT123">
+            <field name="HashtableOfString_Short123" column="HASHTBL_STR_SHORT123"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_Short125" table="HASHTBL_OF_STR_SHORT125">
+            <field name="HashtableOfString_Short125" table="HASHTBL_STR_SHORT125">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -6,313 +6,372 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashtableOfObject_String0" table="HASHTBL_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String1" table="HASHTBL_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String2" table="HASHTBL_OBJECT2_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String3" table="HASHTBL_OBJECT3_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String4" table="HASHTBL_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String6" table="HASHTBL_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String8" table="HASHTBL_OBJECT8_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String9" table="HASHTBL_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String10" table="HASHTBL_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYPCLSREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String11" table="HASHTBL_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYPCLSREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String12" table="HASHTBL_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYPCLSREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String13" table="HASHTBL_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYPCLSREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String15" table="HASHTBL_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYPCLSREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String17" table="HASHTBL_SIMPLE_CLASS17_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYPCLSREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String18" table="HASHTBL_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String19" table="HASHTBL_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String20" table="HASHTBL_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String21" table="HASHTBL_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String22" table="HASHTBL_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String24" table="HASHTBL_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String26" table="HASHTBL_SIMPLE_INTERFACE26_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYPINTREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_String27" column="HASHTBL_STRING27_STR">
+            <field name="HashtableOfString_String27" column="HASHTBL_STRING27_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String28" column="HASHTBL_STRING28_STR">
+            <field name="HashtableOfString_String28" column="HASHTBL_STRING28_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String29" column="HASHTBL_STRING29_STR">
+            <field name="HashtableOfString_String29" column="HASHTBL_STRING29_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String30" column="HASHTBL_STRING30_STR">
+            <field name="HashtableOfString_String30" column="HASHTBL_STRING30_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String31" column="HASHTBL_STRING31_STR">
+            <field name="HashtableOfString_String31" column="HASHTBL_STRING31_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfString_String33" column="HASHTBL_STRING33_STR">
+            <field name="HashtableOfString_String33" column="HASHTBL_STRING33_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfString_String35" table="HASHTBL_STRING35_STR">
                 <join column="IDENTIFIER"/>
-                <key column="STRINGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfDate_String36" column="HASHTBL_DATE36_STR">
+            <field name="HashtableOfDate_String36" column="HASHTBL_DATE36_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDate_String37" column="HASHTBL_DATE37_STR">
+            <field name="HashtableOfDate_String37" column="HASHTBL_DATE37_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDate_String38" column="HASHTBL_DATE38_STR">
+            <field name="HashtableOfDate_String38" column="HASHTBL_DATE38_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDate_String39" column="HASHTBL_DATE39_STR">
+            <field name="HashtableOfDate_String39" column="HASHTBL_DATE39_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDate_String40" column="HASHTBL_DATE40_STR">
+            <field name="HashtableOfDate_String40" column="HASHTBL_DATE40_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDate_String42" column="HASHTBL_DATE42_STR">
+            <field name="HashtableOfDate_String42" column="HASHTBL_DATE42_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfDate_String44" table="HASHTBL_DATE44_STR">
                 <join column="IDENTIFIER"/>
-                <key column="DATEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfBigDecimal_String45" column="HASHTBL_BIG_DECIMAL45_STR">
+            <field name="HashtableOfBigDecimal_String45" column="HASHTBL_BIG_DECIMAL45_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigDecimal_String46" column="HASHTBL_BIG_DECIMAL46_STR">
+            <field name="HashtableOfBigDecimal_String46" column="HASHTBL_BIG_DECIMAL46_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigDecimal_String47" column="HASHTBL_BIG_DECIMAL47_STR">
+            <field name="HashtableOfBigDecimal_String47" column="HASHTBL_BIG_DECIMAL47_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigDecimal_String48" column="HASHTBL_BIG_DECIMAL48_STR">
+            <field name="HashtableOfBigDecimal_String48" column="HASHTBL_BIG_DECIMAL48_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigDecimal_String49" column="HASHTBL_BIG_DECIMAL49_STR">
+            <field name="HashtableOfBigDecimal_String49" column="HASHTBL_BIG_DECIMAL49_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigDecimal_String51" column="HASHTBL_BIG_DECIMAL51_STR">
+            <field name="HashtableOfBigDecimal_String51" column="HASHTBL_BIG_DECIMAL51_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfBigDecimal_String53" table="HASHTBL_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <key>
-                    <column name="BIG_DECIMALVAL"
+                    <column name="KEYVAL"
                             jdbc-type="DECIMAL"
                             length="11"
                             scale="4"/>
                 </key>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfBigInteger_String54" column="HASHTBL_BIG_INTEGER54_STR">
+            <field name="HashtableOfBigInteger_String54" column="HASHTBL_BIG_INTEGER54_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigInteger_String55" column="HASHTBL_BIG_INTEGER55_STR">
+            <field name="HashtableOfBigInteger_String55" column="HASHTBL_BIG_INTEGER55_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigInteger_String56" column="HASHTBL_BIG_INTEGER56_STR">
+            <field name="HashtableOfBigInteger_String56" column="HASHTBL_BIG_INTEGER56_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigInteger_String57" column="HASHTBL_BIG_INTEGER57_STR">
+            <field name="HashtableOfBigInteger_String57" column="HASHTBL_BIG_INTEGER57_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigInteger_String58" column="HASHTBL_BIG_INTEGER58_STR">
+            <field name="HashtableOfBigInteger_String58" column="HASHTBL_BIG_INTEGER58_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfBigInteger_String60" column="HASHTBL_BIG_INTEGER60_STR">
+            <field name="HashtableOfBigInteger_String60" column="HASHTBL_BIG_INTEGER60_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfBigInteger_String62" table="HASHTBL_BIG_INTEGER62_STR">
                 <join column="IDENTIFIER"/>
-                <key column="BIG_INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfByte_String63" column="HASHTBL_BYTE63_STR">
+            <field name="HashtableOfByte_String63" column="HASHTBL_BYTE63_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfByte_String64" column="HASHTBL_BYTE64_STR">
+            <field name="HashtableOfByte_String64" column="HASHTBL_BYTE64_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfByte_String65" column="HASHTBL_BYTE65_STR">
+            <field name="HashtableOfByte_String65" column="HASHTBL_BYTE65_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfByte_String66" column="HASHTBL_BYTE66_STR">
+            <field name="HashtableOfByte_String66" column="HASHTBL_BYTE66_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfByte_String67" column="HASHTBL_BYTE67_STR">
+            <field name="HashtableOfByte_String67" column="HASHTBL_BYTE67_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfByte_String69" column="HASHTBL_BYTE69_STR">
+            <field name="HashtableOfByte_String69" column="HASHTBL_BYTE69_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfByte_String71" table="HASHTBL_BYTE71_STR">
                 <join column="IDENTIFIER"/>
-                <key column="BYTEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfDouble_String72" column="HASHTBL_DOUBLE72_STR">
+            <field name="HashtableOfDouble_String72" column="HASHTBL_DOUBLE72_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDouble_String73" column="HASHTBL_DOUBLE73_STR">
+            <field name="HashtableOfDouble_String73" column="HASHTBL_DOUBLE73_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDouble_String74" column="HASHTBL_DOUBLE74_STR">
+            <field name="HashtableOfDouble_String74" column="HASHTBL_DOUBLE74_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDouble_String75" column="HASHTBL_DOUBLE75_STR">
+            <field name="HashtableOfDouble_String75" column="HASHTBL_DOUBLE75_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDouble_String76" column="HASHTBL_DOUBLE76_STR">
+            <field name="HashtableOfDouble_String76" column="HASHTBL_DOUBLE76_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfDouble_String78" column="HASHTBL_DOUBLE78_STR">
+            <field name="HashtableOfDouble_String78" column="HASHTBL_DOUBLE78_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfDouble_String80" table="HASHTBL_DOUBLE80_STR">
                 <join column="IDENTIFIER"/>
-                <key column="DOUBLEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfFloat_String81" column="HASHTBL_FLOAT81_STR">
+            <field name="HashtableOfFloat_String81" column="HASHTBL_FLOAT81_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfFloat_String82" column="HASHTBL_FLOAT82_STR">
+            <field name="HashtableOfFloat_String82" column="HASHTBL_FLOAT82_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfFloat_String83" column="HASHTBL_FLOAT83_STR">
+            <field name="HashtableOfFloat_String83" column="HASHTBL_FLOAT83_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfFloat_String84" column="HASHTBL_FLOAT84_STR">
+            <field name="HashtableOfFloat_String84" column="HASHTBL_FLOAT84_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfFloat_String85" column="HASHTBL_FLOAT85_STR">
+            <field name="HashtableOfFloat_String85" column="HASHTBL_FLOAT85_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfFloat_String87" column="HASHTBL_FLOAT87_STR">
+            <field name="HashtableOfFloat_String87" column="HASHTBL_FLOAT87_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfFloat_String89" table="HASHTBL_FLOAT89_STR">
                 <join column="IDENTIFIER"/>
-                <key column="FLOATVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfInteger_String90" column="HASHTBL_INTEGER90_STR">
+            <field name="HashtableOfInteger_String90" column="HASHTBL_INTEGER90_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfInteger_String91" column="HASHTBL_INTEGER91_STR">
+            <field name="HashtableOfInteger_String91" column="HASHTBL_INTEGER91_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfInteger_String92" column="HASHTBL_INTEGER92_STR">
+            <field name="HashtableOfInteger_String92" column="HASHTBL_INTEGER92_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfInteger_String93" column="HASHTBL_INTEGER93_STR">
+            <field name="HashtableOfInteger_String93" column="HASHTBL_INTEGER93_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfInteger_String94" column="HASHTBL_INTEGER94_STR">
+            <field name="HashtableOfInteger_String94" column="HASHTBL_INTEGER94_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfInteger_String96" column="HASHTBL_INTEGER96_STR">
+            <field name="HashtableOfInteger_String96" column="HASHTBL_INTEGER96_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfInteger_String98" table="HASHTBL_INTEGER98_STR">
                 <join column="IDENTIFIER"/>
-                <key column="INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfLong_String99" column="HASHTBL_LONG99_STR">
+            <field name="HashtableOfLong_String99" column="HASHTBL_LONG99_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfLong_String100" column="HASHTBL_LONG100_STR">
+            <field name="HashtableOfLong_String100" column="HASHTBL_LONG100_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfLong_String101" column="HASHTBL_LONG101_STR">
+            <field name="HashtableOfLong_String101" column="HASHTBL_LONG101_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfLong_String102" column="HASHTBL_LONG102_STR">
+            <field name="HashtableOfLong_String102" column="HASHTBL_LONG102_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfLong_String103" column="HASHTBL_LONG103_STR">
+            <field name="HashtableOfLong_String103" column="HASHTBL_LONG103_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfLong_String105" column="HASHTBL_LONG105_STR">
             </field>
             <field name="HashtableOfLong_String107" table="HASHTBL_LONG107_STR">
                 <join column="IDENTIFIER"/>
-                <key column="LONGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfShort_String108" column="HASHTBL_SHORT108_STR">
+            <field name="HashtableOfShort_String108" column="HASHTBL_SHORT108_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfShort_String109" column="HASHTBL_SHORT109_STR">
+            <field name="HashtableOfShort_String109" column="HASHTBL_SHORT109_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfShort_String110" column="HASHTBL_SHORT110_STR">
+            <field name="HashtableOfShort_String110" column="HASHTBL_SHORT110_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfShort_String111" column="HASHTBL_SHORT111_STR">
+            <field name="HashtableOfShort_String111" column="HASHTBL_SHORT111_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfShort_String112" column="HASHTBL_SHORT112_STR">
+            <field name="HashtableOfShort_String112" column="HASHTBL_SHORT112_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfShort_String114" column="HASHTBL_SHORT114_STR">
+            <field name="HashtableOfShort_String114" column="HASHTBL_SHORT114_STR"
+                   serialized="true">
             </field>
             <field name="HashtableOfShort_String116" table="HASHTBL_SHORT116_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SHORTVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -54,7 +54,8 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfString10" column="LINKEDLIST_OF_STRING10">
+            <field name="LinkedListOfString10" column="LINKEDLIST_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="LinkedListOfString11" table="LINKEDLIST_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -66,7 +67,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfDate13" column="LINKEDLIST_OF_DATE13">
+            <field name="LinkedListOfDate13" column="LINKEDLIST_OF_DATE13"
+                   serialized="true">
             </field>
             <field name="LinkedListOfDate14" table="LINKEDLIST_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -78,7 +80,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLocale16" column="LINKEDLIST_OF_LOCALE16">
+            <field name="LinkedListOfLocale16" column="LINKEDLIST_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="LinkedListOfLocale17" table="LINKEDLIST_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -90,7 +93,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfBigDecimal19" column="LINKEDLIST_OF_BIG_DECIMAL19">
+            <field name="LinkedListOfBigDecimal19" column="LINKEDLIST_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
             <field name="LinkedListOfBigDecimal20" table="LINKEDLIST_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -102,7 +106,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfBigInteger22" column="LINKEDLIST_OF_BIG_INTEGER22">
+            <field name="LinkedListOfBigInteger22" column="LINKEDLIST_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="LinkedListOfBigInteger23" table="LINKEDLIST_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -114,9 +119,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfByte25" column="LINKEDLIST_OF_BYTE25">
+            <field name="LinkedListOfByte25" column="LINKEDLIST_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="LinkedListOfByte26" table="LINKEDLIST_OF_BYTE27">
+            <field name="LinkedListOfByte26" table="LINKEDLIST_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
@@ -126,7 +132,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfDouble28" column="LINKEDLIST_OF_DOUBLE28">
+            <field name="LinkedListOfDouble28" column="LINKEDLIST_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="LinkedListOfDouble29" table="LINKEDLIST_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -138,7 +145,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfFloat31" column="LINKEDLIST_OF_FLOAT31">
+            <field name="LinkeFrom jdo-commits-return-772-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Tue Jul 26 20:19:06 2005
Return-Path: <jdo-commits-return-772-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 415 invoked from network); 26 Jul 2005 20:19:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 26 Jul 2005 20:19:06 -0000
Received: (qmail 94198 invoked by uid 500); 26 Jul 2005 20:19:05 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 94156 invoked by uid 99); 26 Jul 2005 20:19:04 -0000
X-ASF-Spam-Status: No, hits=-9.6 requirdListOfFloat31" column="LINKEDLIST_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="LinkedListOfFloat32" table="LINKEDLIST_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -150,7 +158,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfInteger34" column="LINKEDLIST_OF_INTEGER34">
+            <field name="LinkedListOfInteger34" column="LINKEDLIST_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="LinkedListOfInteger35" table="LINKEDLIST_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -162,7 +171,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37">
+            <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37"
+                   serialized=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 26 Jul 2005 13:18:52 -0700
Received: (qmail 304 invoked by uid 65534); 26 Jul 2005 20:18:49 -0000
Message-ID: <20050726201846.298.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r225384 [1/6] - in /incubator/jdo/trunk/tck20/test:
 orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
 orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
 sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Date: Tue, 26 Jul 2005 20:18:03 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mcaisse
Date: Tue Jul 26 13:17:23 2005
New Revision: 225384

URL: http://svn.apache.orged="true">
             </field>
             <field name="LinkedListOfLong38" table="LINKEDLIST_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -174,7 +184,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfShort40" column="LINKEDLIST_OF_SHORT40">
+            <field name="LinkedListOfShort40" column="LINKEDLIST_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="LinkedListOfShort41" table="LINKEDLIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- in/viewcvs?rev=225384&view=rev
Log:
Numerous fixes to orm metadata, schema

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -54,7 +54,8 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfString10" column="LIST_OF_STRING10">
+            <field name="ListOfString10" column="LIST_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="ListOfString11" table="LIST_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -66,7 +67,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfDate13" column="LIST_OF_DATE13">
+            <field name="ListOfDate13" column="LIST_OF_DATE13"
+                   serialized="true">
             </field>
   cationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtype          <field name="ListOfDate14" table="LIST_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -78,7 +80,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLocale16" column="LIST_OF_LOCALE16">
+            <field name="ListOfLocale16" column="LIST_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="ListOfLocale17" table="LIST_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -90,7 +93,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfBigDecimal19" column="LIST_OF_BIG_DECIMAL19">
+            <field name="ListOfBigDecimal19" column="LIST_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
             <field name="ListOfBigDecimal20" table="LIST_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -102,s/ArrayListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-de7 +106,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfBigInteger22" column="LIST_OF_BIG_INTEGER22">
+            <field name="ListOfBigInteger22" column="LIST_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="ListOfBigInteger23" table="LIST_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -114,9 +119,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfByte25" column="LIST_OF_BYTE25">
+            <field name="ListOfByte25" column="LIST_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="ListOfByte26" table="LIST_OF_BYTE27">
+            <field name="ListOfByte26" table="LIST_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <orderby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/Arr column="INDEX"/>
@@ -126,7 +132,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfDouble28" column="LIST_OF_DOUBLE28">
+            <field name="ListOfDouble28" column="LIST_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="ListOfDouble29" table="LIST_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -138,7 +145,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfFloat31" column="LIST_OF_FLOAT31">
+            <field name="ListOfFloat31" column="LIST_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="ListOfFloat32" table="LIST_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -150,7 +158,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>rayListCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -2,181 +2,223 @@
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayListCollections" table="LIST_COLLECTIONS">
+        <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="ArrayListOfObject0" table="ARRAYLIST_OF_OBJECT0">
+            <field name="ArrayListOfObject0"
+                   table="A
-            <field name="ListOfInteger34" column="LIST_OF_INTEGER34">
+            <field name="ListOfInteger34" column="LIST_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="ListOfInteger35" table="LIST_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -162,7 +171,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLong37" column="LIST_OF_LONG37">
+            <field name="ListOfLong37" column="LIST_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="ListOfLong38" table="LIST_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -174,7 +184,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfShort40" column="LIST_OF_SHORT40">
+            <field name="ListOfShort40" column="LIST_OF_SHORT40"
+                RRAYLIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfObject1" table="ARRAYLIST_OF_OBJECT1">
+            <field name="ArrayListOfObject1"
+                   table="ARRAYLIST_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfObject2" table="ARRAYLIST_OF_OBJECT2">
+            <field name="ArrayListOfObject2"
+                   table="ARRAYLIST_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfSimpleClass3" table="ARRAYLIST_OF_SIMPLE_CLASS3">
+            <field name="ArrayListOfSimpleClass3"
+                   table="ARRAYLIST_OF_SIMPLE_CLASS3">
           serialized="true">
             </field>
             <field name="ListOfShort41" table="LIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>



         <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfSimpleClass4" table="ARRAYLIST_OF_SIMPLE_CLASS4">
+            <field name="ArrayListOfSimpleClass4"
+                   table="ARRAYLIST_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfSimpleClass5" table="ARRAYLIST_OF_SIMPLE_CLASS5">
+            <field name="ArrayListOfSimpleClass5"
+                   table="ARRAYLIST_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfSimpleInterface6" table="ARRAYLIST_OF_SIMPLE_INTERFACE6">
+            <field name="ArrayListOfSimpleInterface6"
+                   table="ARRAYLIST_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfSimpleInterface7" table="ARRAYLIST_OF_SIMPLE_INTERFACE7">
+            <field name="ArrayListOfSimpleInterface7"
+                   table="ARRAYLIST_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfSimpleInterface8" table="ARRAYLIST_OF_SIMPLE_INTERFACE8">
+            <field name="ArrayListOfSimpleInterface8"
+                   table="ARRAYLIST_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfString9" table="ARRAYLIST_OF_STRING9">
+            <field name="ArrayListOfString9"
+                   table="ARRAYLIST_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfString10" column="ARRAYLIST_OF_STRING10">
+            <field name="ArrayListOfString10" column="ARRAYLIST_OF_STRING10"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfString11" table="ARRAYLIST_OF_STRING11">
+            <field name="ArrayListOfString11"
+                   table="ARRAYLIST_OF_STRING11">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDate12" table="ARRAYLIST_OF_DATE12">
+            <field name="ArrayListOfDate12"
+                   table="ARRAYLIST_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDate13" column="ARRAYLIST_OF_DATE13">
+            <field name="ArrayListOfDate13" column="ARRAYLIST_OF_DATE13"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfDate14" table="ARRAYLIST_OF_DATE14">
+            <field name="ArrayListOfDate14"
+                   table="ARRAYLIST_OF_DATE14">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLocale15" table="ARRAYLIST_OF_LOCALE15">
+            <field name="ArrayListOfLocale15"
+                   table="ARRAYLIST_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLocale16" column="ARRAYLIST_OF_LOCALE16">
+            <field name="ArrayListOfLocale16" column="ARRAYLIST_OF_LOCALE16"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfLocale17" table="ARRAYLIST_OF_LOCALE17">
+            <field name="ArrayListOfLocale17"
+                   table="ARRAYLIST_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigDecimal18" table="ARRAYLIST_OF_BIG_DECIMAL18">
+            <field name="ArrayListOfBigDecimal18"
+                   table="ARRAYLIST_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigDecimal19" column="ARRAYLIST_OF_BIG_DECIMAL19">
+            <field name="ArrayListOfBigDecimal19" column="ARRAYLIST_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfBigDecimal20" table="ARRAYLIST_OF_BIG_DECIMAL20">
+            <field name="ArrayListOfBigDecimal20"
+                   table="ARRAYLIST_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigInteger21" table="ARRAYLIST_OF_BIG_INTEGER21">
+            <field name="ArrayListOfBigInteger21"
+                   table="ARRAYLIST_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigInteger22" column="ARRAYLIST_OF_BIG_INTEGER22">
+            <field name="ArrayListOfBigInteger22" column="ARRAYLIST_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfBigInteger23" table="ARRAYLIST_OF_BIG_INTEGER23">
+            <field name="ArrayListOfBigInteger23"
+                   table="ARRAYLIST_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfByte24" table="ARRAYLIST_OF_BYTE24">
+            <field name="ArrayListOfByte24"
+                   table="ARRAYLIST_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfByte25" column="ARRAYLIST_OF_BYTE25">
+            <field name="ArrayListOfByte25" column="ARRAYLIST_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfByte26" table="ARRAYLIST_OF_BYTE27">
+            <field name="ArrayListOfByte26"
+                   table="ARRAYLIST_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDouble27" table="ARRAYLIST_OF_DOUBLE27">
+            <field name="ArrayListOfDouble27"
+                   table="ARRAYLIST_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDouble28" column="ARRAYLIST_OF_DOUBLE28">
+            <field name="ArrayListOfDouble28" column="ARRAYLIST_OF_DOUBLE28"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfDouble29" table="ARRAYLIST_OF_DOUBLE29">
+            <field name="ArrayListOfDouble29"
+                   table="ARRAYLIST_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfFloat30" table="ARRAYLIST_OF_FLOAT30">
+            <field name="ArrayListOfFloat30"
+                   table="ARRAYLIST_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfFloat31" column="ARRAYLIST_OF_FLOAT31">
+            <field name="ArrayListOfFloat31" column="ARRAYLIST_OF_FLOAT31"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfFloat32" table="ARRAYLIST_OF_FLOAT32">
+            <field name="ArrayListOfFloat32"
+                   table="ARRAYLIST_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfInteger33" table="ARRAYLIST_OF_INTEGER33">
+            <field name="ArrayListOfInteger33"
+                   table="ARRAYLIST_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfInteger34" column="ARRAYLIST_OF_INTEGER34">
+            <field name="ArrayListOfInteger34" column="ARRAYLIST_OF_INTEGER34"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfInteger35" table="ARRAYLIST_OF_INTEGER35">
+            <field name="ArrayListOfInteger35"
+                   table="ARRAYLIST_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLong36" table="ARRAYLIST_OF_LONG36">
+            <field name="ArrayListOfLong36"
+                   table="ARRAYLIST_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLong37" column="ARRAYLIST_OF_LONG37">
+            <field name="ArrayListOfLong37" column="ARRAYLIST_OF_LONG37"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfLong38" table="ARRAYLIST_OF_LONG38">
+            <field name="ArrayListOfLong38"
+                   table="ARRAYLIST_OF_LONG38">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfShort39" table="ARRAYLIST_OF_SHORT39">
+            <field name="ArrayListOfShort39"
+                   table="ARRAYLIST_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40">
+            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40"
+                   serialized="true">
             </field>
-            <field name="ArrayListOfShort41" table="ARRAYLIST_OF_SHORT41">
+            <field name="ArrayListOfShort41"
+                   table="ARRAYLIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -4,149 +4,202 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="CollectionOfObject0" table="COLLECTION_OF_OBJECT0">
+            <field name="CollectionOfObject0"
+                   table="COLLECTION_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
             </field>
-            <field name="CollectionOfObject1" table="COLLECTION_OF_OBJECT1">
+            <field name="CollectionOfObject1"
+                   table="COLLECTION_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
             </field>
-            <field name="CollectionOfObject2" table="COLLECTION_OF_OBJECT2">
+            <field name="CollectionOfObject2"
+                   table="COLLECTION_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
             </field>
-            <field name="CollectionOfSimpleClass3" table="COLLECTION_OF_SIMPLE_CLASS3">
+            <field name="CollectionOfSimpleClass3"
+                   table="COLLECTION_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
             </field>
-            <field name="CollectionOfSimpleClass4" table="COLLECTION_OF_SIMPLE_CLASS4">
+            <field name="CollectionOfSimpleClass4"
+                   table="COLLECTION_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
             </field>
-            <field name="CollectionOfSimpleClass5" table="COLLECTION_OF_SIMPLE_CLASS5">
+            <field name="CollectionOfSimpleClass5"
+                   table="COLLECTION_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
             </field>
-            <field name="CollectionOfSimpleInterface6" table="COLLECTION_OF_SIMPLE_INTERFACE6">
+            <field name="CollectionOfSimpleInterface6"
+                   table="COLLECTION_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfSimpleInterface7" table="COLLECTION_OF_SIMPLE_INTERFACE7">
+            <field name="CollectionOfSimpleInterface7"
+                   table="COLLECTION_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfSimpleInterface8" table="COLLECTION_OF_SIMPLE_INTERFACE8">
+            <field name="CollectionOfSimpleInterface8"
+                   table="COLLECTION_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfString9" table="COLLECTION_OF_STRING9">
+            <field name="CollectionOfString9"
+                   table="COLLECTION_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfString10" column="COLLECTION_OF_STRING10">
+            <field name="CollectionOfString10"
+                   column="COLLECTION_OF_STRING10"
+                   serialized="true">
             </field>
-            <field name="CollectionOfString11" table="COLLECTION_OF_STRING11">
+            <field name="CollectionOfString11"
+                   table="COLLECTION_OF_STRING11">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfDate12" table="COLLECTION_OF_DATE12">
+            <field name="CollectionOfDate12"
+                   table="COLLECTION_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfDate13" column="COLLECTION_OF_DATE13">
+            <field name="CollectionOfDate13"
+                   column="COLLECTION_OF_DATE13"
+                   serialized="true">
             </field>
-            <field name="CollectionOfDate14" table="COLLECTION_OF_DATE14">
+            <field name="CollectionOfDate14"
+                   table="COLLECTION_OF_DATE14">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfLocale15" table="COLLECTION_OF_LOCALE15">
+            <field name="CollectionOfLocale15"
+                   table="COLLECTION_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfLocale16" column="COLLECTION_OF_LOCALE16">
+            <field name="CollectionOfLocale16"
+                   column="COLLECTION_OF_LOCALE16"
+                   serialized="true">
             </field>
-            <field name="CollectionOfLocale17" table="COLLECTION_OF_LOCALE17">
+            <field name="CollectionOfLocale17"
+                   table="COLLECTION_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal18" table="COLLECTION_OF_BIG_DECIMAL18">
+            <field name="CollectionOfBigDecimal18"
+                   table="COLLECTION_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal19" column="COLLECTION_OF_BIG_DECIMAL19">
+            <field name="CollectionOfBigDecimal19"
+                   column="COLLECTION_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="CollectionOfBigDecimal20" table="COLLECTION_OF_BIG_DECIMAL20">
+            <field name="CollectionOfBigDecimal20"
+                   table="COLLECTION_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigInteger21" table="COLLECTION_OF_BIG_INTEGER21">
+            <field name="CollectionOfBigInteger21"
+                   table="COLLECTION_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfBigInteger22" column="COLLECTION_OF_BIG_INTEGER22">
+            <field name="CollectionOfBigInteger22"
+                   column="COLLECTION_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="CollectionOfBigInteger23" table="COLLECTION_OF_BIG_INTEGER23">
+            <field name="CollectionOfBigInteger23"
+                   table="COLLECTION_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfByte24" table="COLLECTION_OF_BYTE24">
+            <field name="CollectionOfByte24"
+                   table="COLLECTION_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfByte25" column="COLLECTION_OF_BYTE25">
+            <field name="CollectionOfByte25"
+                   column="COLLECTION_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="CollectionOfByte26" table="COLLECTION_OF_BYTE26">
+            <field name="CollectionOfByte26"
+                   table="COLLECTION_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfDouble27" table="COLLECTION_OF_DOUBLE27">
+            <field name="CollectionOfDouble27"
+                   table="COLLECTION_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfDouble28" column="COLLECTION_OF_DOUBLE28">
+            <field name="CollectionOfDouble28"
+                   column="COLLECTION_OF_DOUBLE28"
+                   serialized="true">
             </field>
-            <field name="CollectionOfDouble29" table="COLLECTION_OF_DOUBLE29">
+            <field name="CollectionOfDouble29"
+                   table="COLLECTION_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfFloat30" table="COLLECTION_OF_FLOAT30">
+            <field name="CollectionOfFloat30"
+                   table="COLLECTION_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfFloat31" column="COLLECTION_OF_FLOAT31">
+            <field name="CollectionOfFloat31"
+                   column="COLLECTION_OF_FLOAT31"
+                   serialized="true">
             </field>
-            <field name="CollectionOfFloat32" table="COLLECTION_OF_FLOAT32">
+            <field name="CollectionOfFloat32"
+                   table="COLLECTION_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfInteger33" table="COLLECTION_OF_INTEGER33">
+            <field name="CollectionOfInteger33"
+                   table="COLLECTION_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34">
+            <field name="CollectionOfInteger34"
+                   column="COLLECTION_OF_INTEGER34"
+                   serialized="true">
             </field>
-            <field name="CollectionOfInteger35" table="COLLECTION_OF_INTEGER35">
+            <field name="CollectionOfInteger35"
+                   table="COLLECTION_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfLong36" table="COLLECTION_OF_LONG36">
+            <field name="CollectionOfLong36"
+                   table="COLLECTION_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfLong37" column="COLLECTION_OF_LONG37">
+            <field name="CollectionOfLong37"
+                   column="COLLECTION_OF_LONG37"
+                   serialized="true">
             </field>
-            <field name="CollectionOfLong38" table="COLLECTION_OF_LONG38">
+            <field name="CollectionOfLong38"
+                   table="COLLECTION_OF_LONG38">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfShort39" table="COLLECTION_OF_SHORT39">
+            <field name="CollectionOfShort39"
+                   table="COLLECTION_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
             </field>
-            <field name="CollectionOfShort40" column="COLLECTION_OF_SHORT40">
+            <field name="CollectionOfShort40"
+                   column="COLLECTION_OF_SHORT40"
+                   serialized="true">
             </field>
-            <field name="CollectionOfShort41" table="COLLECTION_OF_SHORT41">
+            <field name="CollectionOfShort41"
+                   table="COLLECTION_OF_SHORT41">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -6,317 +6,459 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object1" table="HASHMAP_STR_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object2" table="HASHMAP_STR_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass3" table="HASHMAP_STR_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass4" table="HASHMAP_STR_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass5" table="HASHMAP_STR_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface6" table="HASHMAP_STR_SIMPLE_INTERFACE6">
+            <field name="HashMapOfString_SimpleInterface6"
+                   table="HASHMAP_STR_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface7" column="HASHMAP_STR_SIMPLE_INTERFACE7">
+            <field name="HashMapOfString_SimpleInterface7"
+                   table="HASHMAP_STR_SIMPLE_INTERFACE7">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface8" column="HASHMAP_STR_SIMPLE_INTERFACE8">
+            <field name="HashMapOfString_SimpleInterface8"
+                   table="HASHMAP_STR_SIMPLE_INTERFACE8">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_String9" column="HASHMAP_STR_STRING9">
+            <field name="HashMapOfString_String9"
+                   column="HASHMAP_STR_STRING9"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String10" column="HASHMAP_STR_STRING10">
+            <field name="HashMapOfString_String10"
+                   column="HASHMAP_STR_STRING10"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String11" column="HASHMAP_STR_STRING11">
+            <field name="HashMapOfString_String11"
+                   column="HASHMAP_STR_STRING11"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Date12" column="HASHMAP_STR_DATE12">
+            <field name="HashMapOfString_Date12"
+                   column="HASHMAP_STR_DATE12"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Date13" column="HASHMAP_STR_DATE13">
+            <field name="HashMapOfString_Date13"
+                   column="HASHMAP_STR_DATE13"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Date14" column="HASHMAP_STR_DATE14">
+            <field name="HashMapOfString_Date14"
+                   column="HASHMAP_STR_DATE14"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Locale15" column="HASHMAP_STR_LOCALE15">
+            <field name="HashMapOfString_Locale15"
+                   column="HASHMAP_STR_LOCALE15"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Locale16" column="HASHMAP_STR_LOCALE16">
+            <field name="HashMapOfString_Locale16"
+                   column="HASHMAP_STR_LOCALE16"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Locale17" column="HASHMAP_STR_LOCALE17">
+            <field name="HashMapOfString_Locale17"
+                   column="HASHMAP_STR_LOCALE17"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigDecimal18" column="HASHMAP_STR_BIG_DECIMAL18">
+            <field name="HashMapOfString_BigDecimal18"
+                   column="HASHMAP_STR_BIG_DECIMAL18"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigDecimal19" column="HASHMAP_STR_BIG_DECIMAL19">
+            <field name="HashMapOfString_BigDecimal19"
+                   column="HASHMAP_STR_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigDecimal20" column="HASHMAP_STR_BIG_DECIMAL20">
+            <field name="HashMapOfString_BigDecimal20"
+                   column="HASHMAP_STR_BIG_DECIMAL20"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigInteger21" column="HASHMAP_STR_BIG_INTEGER21">
+            <field name="HashMapOfString_BigInteger21"
+                   column="HASHMAP_STR_BIG_INTEGER21"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigInteger22" column="HASHMAP_STR_BIG_INTEGER22">
+            <field name="HashMapOfString_BigInteger22"
+                   column="HASHMAP_STR_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigInteger23" column="HASHMAP_STR_BIG_INTEGER23">
+            <field name="HashMapOfString_BigInteger23"
+                   column="HASHMAP_STR_BIG_INTEGER23"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Byte24" column="HASHMAP_STR_BYTE24">
+            <field name="HashMapOfString_Byte24"
+                   column="HASHMAP_STR_BYTE24"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Byte25" column="HASHMAP_STR_BYTE25">
+            <field name="HashMapOfString_Byte25"
+                   column="HASHMAP_STR_BYTE25"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Byte26" column="HASHMAP_STR_BYTE27">
+            <field name="HashMapOfString_Byte26"
+                   column="HASHMAP_STR_BYTE26"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Double27" column="HASHMAP_STR_DOUBLE27">
+            <field name="HashMapOfString_Double27"
+                   column="HASHMAP_STR_DOUBLE27"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Double28" column="HASHMAP_STR_DOUBLE28">
+            <field name="HashMapOfString_Double28"
+                   column="HASHMAP_STR_DOUBLE28"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Double29" column="HASHMAP_STR_DOUBLE29">
+            <field name="HashMapOfString_Double29"
+                   column="HASHMAP_STR_DOUBLE29"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Float30" column="HASHMAP_STR_FLOAT30">
+            <field name="HashMapOfString_Float30"
+                   column="HASHMAP_STR_FLOAT30"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Float31" column="HASHMAP_STR_FLOAT31">
+            <field name="HashMapOfString_Float31"
+                   column="HASHMAP_STR_FLOAT31"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Float32" column="HASHMAP_STR_FLOAT32">
+            <field name="HashMapOfString_Float32"
+                   column="HASHMAP_STR_FLOAT32"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Integer33" column="HASHMAP_STR_INTEGER33">
+            <field name="HashMapOfString_Integer33"
+                   column="HASHMAP_STR_INTEGER33"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Integer34" column="HASHMAP_STR_INTEGER34">
+            <field name="HashMapOfString_Integer34"
+                   column="HASHMAP_STR_INTEGER34"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Integer35" column="HASHMAP_STR_INTEGER35">
+            <field name="HashMapOfString_Integer35"
+                   column="HASHMAP_STR_INTEGER35"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Long36" column="HASHMAP_STR_LONG36">
+            <field name="HashMapOfString_Long36"
+                   column="HASHMAP_STR_LONG36"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Long37" column="HASHMAP_STR_LONG37">
+            <field name="HashMapOfString_Long37"
+                   column="HASHMAP_STR_LONG37"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Long38" column="HASHMAP_STR_LONG38">
+            <field name="HashMapOfString_Long38"
+                   column="HASHMAP_STR_LONG38"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Short39" column="HASHMAP_STR_SHORT39">
+            <field name="HashMapOfString_Short39"
+                   column="HASHMAP_STR_SHORT39"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Short40" column="HASHMAP_STR_SHORT40">
+            <field name="HashMapOfString_Short40"
+                   column="HASHMAP_STR_SHORT40"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Short41" column="HASHMAP_STR_SHORT41">
+            <field name="HashMapOfString_Short41"
+                   column="HASHMAP_STR_SHORT41"
+                   serialized="true">
             </field>
-  <field name="HashMapOfString_Object42" table="HASHMAP_STR_OBJECT42">
+            <field name="HashMapOfString_Object42" table="HASHMAP_STR_OBJECT42">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object43" table="HASHMAP_STR_OBJECT43">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass45" table="HASHMAP_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass46" table="HASHMAP_STR_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface48" table="HASHMAP_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface49" table="HASHMAP_STR_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_String51" column="HASHMAP_STR_STRING51">
-            </field>
-            <field name="HashMapOfString_String52" column="HASHMAP_STR_STRING52">
-            </field>
-            <field name="HashMapOfString_Date54" column="HASHMAP_STR_DATE54">
-            </field>
-            <field name="HashMapOfString_Date55" column="HASHMAP_STR_DATE55">
-            </field>
-            <field name="HashMapOfString_Locale57" column="HASHMAP_STR_LOCALE57">
-            </field>
-            <field name="HashMapOfString_Locale58" column="HASHMAP_STR_LOCALE58">
-            </field>
-            <field name="HashMapOfString_BigDecimal60" column="HASHMAP_STR_BIG_DECIMAL60">
-            </field>
-            <field name="HashMapOfString_BigDecimal61" column="HASHMAP_STR_BIG_DECIMAL61">
-            </field>
-            <field name="HashMapOfString_BigInteger63" column="HASHMAP_STR_BIG_INTEGER63">
-            </field>
-            <field name="HashMapOfString_BigInteger64" column="HASHMAP_STR_BIG_INTEGER64">
-            </field>
-            <field name="HashMapOfString_Byte66" column="HASHMAP_STR_BYTE66">
-            </field>
-            <field name="HashMapOfString_Byte67" column="HASHMAP_STR_BYTE67">
-            </field>
-            <field name="HashMapOfString_Double69" column="HASHMAP_STR_DOUBLE69">
-            </field>
-            <field name="HashMapOfString_Double70" column="HASHMAP_STR_DOUBLE70">
-            </field>
-            <field name="HashMapOfString_Float72" column="HASHMAP_STR_FLOAT72">
-            </field>
-            <field name="HashMapOfString_Float73" column="HASHMAP_STR_FLOAT73">
-            </field>
-            <field name="HashMapOfString_Integer75" column="HASHMAP_STR_INTEGER75">
-            </field>
-            <field name="HashMapOfString_Integer76" column="HASHMAP_STR_INTEGER76">
-            </field>
-            <field name="HashMapOfString_Long78" column="HASHMAP_STR_LONG78">
-            </field>
-            <field name="HashMapOfString_Long79" column="HASHMAP_STR_LONG79">
-            </field>
-            <field name="HashMapOfString_Short81" column="HASHMAP_STR_SHORT81">
-            </field>
-            <field name="HashMapOfString_Short82" column="HASHMAP_STR_SHORT82">
+            <field name="HashMapOfString_String51"
+                   column="HASHMAP_STR_STRING51"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_String52"
+                   column="HASHMAP_STR_STRING52"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Date54"
+                   column="HASHMAP_STR_DATE54"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Date55"
+                   column="HASHMAP_STR_DATE55"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Locale57"
+                   column="HASHMAP_STR_LOCALE57"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Locale58"
+                   column="HASHMAP_STR_LOCALE58"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_BigDecimal60"
+                   column="HASHMAP_STR_BIG_DECIMAL60"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_BigDecimal61"
+                   column="HASHMAP_STR_BIG_DECIMAL61"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_BigInteger63"
+                   column="HASHMAP_STR_BIG_INTEGER63"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_BigInteger64"
+                   column="HASHMAP_STR_BIG_INTEGER64"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Byte66"
+                   column="HASHMAP_STR_BYTE66"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Byte67"
+                   column="HASHMAP_STR_BYTE67"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Double69"
+                   column="HASHMAP_STR_DOUBLE69"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Double70"
+                   column="HASHMAP_STR_DOUBLE70"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Float72"
+                   column="HASHMAP_STR_FLOAT72"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Float73"
+                   column="HASHMAP_STR_FLOAT73"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Integer75"
+                   column="HASHMAP_STR_INTEGER75"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Integer76"
+                   column="HASHMAP_STR_INTEGER76"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Long78"
+                   column="HASHMAP_STR_LONG78"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Long79"
+                   column="HASHMAP_STR_LONG79"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Short81"
+                   column="HASHMAP_STR_SHORT81"
+                   serialized="true">
+            </field>
+            <field name="HashMapOfString_Short82"
+                   column="HASHMAP_STR_SHORT82"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object86" table="HASHMAP_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass87" table="HASHMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass89" table="HASHMAP_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface90" table="HASHMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface92" table="HASHMAP_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_String93" column="HASHMAP_STR_STRING93">
+            <field name="HashMapOfString_String93"
+                   column="HASHMAP_STR_STRING93"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_String95" table="HASHMAP_STR_STRING95">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
+                <key column="KEYVAL"/>
+                <value column="KEYVALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Date96" column="HASHMAP_STR_DATE96">
+            <field name="HashMapOfString_Date96"
+                   column="HASHMAP_STR_DATE96"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Date98" table="HASHMAP_STR_DATE98">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Locale99" column="HASHMAP_STR_LOCALE99">
+            <field name="HashMapOfString_Locale99"
+                   column="HASHMAP_STR_LOCALE99"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Locale101" table="HASHMAP_STR_LOCALE101">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_BigDecimal102" column="HASHMAP_STR_BIG_DECIMAL102">
+            <field name="HashMapOfString_BigDecimal102"
+                   column="HASHMAP_STR_BIG_DECIMAL102"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_BigDecimal104" table="HASHMAP_STR_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_BigInteger105" column="HASHMAP_STR_BIG_INTEGER105">
+            <field name="HashMapOfString_BigInteger105"
+                   column="HASHMAP_STR_BIG_INTEGER105"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_BigInteger107" table="HASHMAP_STR_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Byte108" column="HASHMAP_STR_BYTE108">
+            <field name="HashMapOfString_Byte108"
+                   column="HASHMAP_STR_BYTE108"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Byte110" table="HASHMAP_STR_BYTE110">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Double111" column="HASHMAP_STR_DOUBLE111">
+            <field name="HashMapOfString_Double111" 
+                   serialized="true"
+                   column="HASHMAP_STR_DOUBLE111">
             </field>
             <field name="HashMapOfString_Double113" table="HASHMAP_STR_DOUBLE113">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Float114" column="HASHMAP_STR_FLOAT114">
+            <field name="HashMapOfString_Float114"
+                   column="HASHMAP_STR_FLOAT114">
             </field>
             <field name="HashMapOfString_Float116" table="HASHMAP_STR_FLOAT116">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Integer117" column="HASHMAP_STR_INTEGER117">
+            <field name="HashMapOfString_Integer117"
+                   column="HASHMAP_STR_INTEGER117"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Integer119" table="HASHMAP_STR_INTEGER119">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Long120" column="HASHMAP_STR_LONG120">
+            <field name="HashMapOfString_Long120"
+                   serialized="true"
+                    column="HASHMAP_STR_LONG120">
             </field>
             <field name="HashMapOfString_Long122" table="HASHMAP_STR_LONG122">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Short123" column="HASHMAP_STR_SHORT123">
+            <field name="HashMapOfString_Short123"
+                   column="HASHMAP_STR_SHORT123"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Short125" table="HASHMAP_STR_SHORT125">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -6,313 +6,372 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String8" table="HASHMAP_OBJECT8_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String9" table="HASHMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String10" table="HASHMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String11" table="HASHMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String12" table="HASHMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String13" table="HASHMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String15" table="HASHMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String17" table="HASHMAP_SIMPLE_CLASS17_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String18" table="HASHMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String19" table="HASHMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String20" table="HASHMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String21" table="HASHMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String22" table="HASHMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String24" table="HASHMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String26" table="HASHMAP_SIMPLE_INTERFACE26_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_String27" column="HASHMAP_STRING27_STR">
+            <field name="HashMapOfString_String27" column="HASHMAP_STRING27_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String28" column="HASHMAP_STRING28_STR">
+            <field name="HashMapOfString_String28" column="HASHMAP_STRING28_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String29" column="HASHMAP_STRING29_STR">
+            <field name="HashMapOfString_String29" column="HASHMAP_STRING29_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String30" column="HASHMAP_STRING30_STR">
+            <field name="HashMapOfString_String30" column="HASHMAP_STRING30_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String31" column="HASHMAP_STRING31_STR">
+            <field name="HashMapOfString_String31" column="HASHMAP_STRING31_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String33" column="HASHMAP_STRING33_STR">
+            <field name="HashMapOfString_String33" column="HASHMAP_STRING33_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_String35" table="HASHMAP_STRING35_STR">
                 <join column="IDENTIFIER"/>
-                <key column="STRINGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfDate_String36" column="HASHMAP_DATE36_STR">
+            <field name="HashMapOfDate_String36" column="HASHMAP_DATE36_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDate_String37" column="HASHMAP_DATE37_STR">
+            <field name="HashMapOfDate_String37" column="HASHMAP_DATE37_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDate_String38" column="HASHMAP_DATE38_STR">
+            <field name="HashMapOfDate_String38" column="HASHMAP_DATE38_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDate_String39" column="HASHMAP_DATE39_STR">
+            <field name="HashMapOfDate_String39" column="HASHMAP_DATE39_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDate_String40" column="HASHMAP_DATE40_STR">
+            <field name="HashMapOfDate_String40" column="HASHMAP_DATE40_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDate_String42" column="HASHMAP_DATE42_STR">
+            <field name="HashMapOfDate_String42" column="HASHMAP_DATE42_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfDate_String44" table="HASHMAP_DATE44_STR">
                 <join column="IDENTIFIER"/>
-                <key column="DATEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfBigDecimal_String45" column="HASHMAP_BIG_DECIMAL45_STR">
+            <field name="HashMapOfBigDecimal_String45" column="HASHMAP_BIG_DECIMAL45_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigDecimal_String46" column="HASHMAP_BIG_DECIMAL46_STR">
+            <field name="HashMapOfBigDecimal_String46" column="HASHMAP_BIG_DECIMAL46_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigDecimal_String47" column="HASHMAP_BIG_DECIMAL47_STR">
+            <field name="HashMapOfBigDecimal_String47" column="HASHMAP_BIG_DECIMAL47_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigDecimal_String48" column="HASHMAP_BIG_DECIMAL48_STR">
+            <field name="HashMapOfBigDecimal_String48" column="HASHMAP_BIG_DECIMAL48_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigDecimal_String49" column="HASHMAP_BIG_DECIMAL49_STR">
+            <field name="HashMapOfBigDecimal_String49" column="HASHMAP_BIG_DECIMAL49_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigDecimal_String51" column="HASHMAP_BIG_DECIMAL51_STR">
+            <field name="HashMapOfBigDecimal_String51" column="HASHMAP_BIG_DECIMAL51_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfBigDecimal_String53" table="HASHMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <key>
-                    <column name="BIG_DECIMALVAL"
+                    <column name="KEYVAL"
                             jdbc-type="DECIMAL"
                             length="11"
                             scale="4"/>
                 </key>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfBigInteger_String54" column="HASHMAP_BIG_INTEGER54_STR">
+            <field name="HashMapOfBigInteger_String54" column="HASHMAP_BIG_INTEGER54_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigInteger_String55" column="HASHMAP_BIG_INTEGER55_STR">
+            <field name="HashMapOfBigInteger_String55" column="HASHMAP_BIG_INTEGER55_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigInteger_String56" column="HASHMAP_BIG_INTEGER56_STR">
+            <field name="HashMapOfBigInteger_String56" column="HASHMAP_BIG_INTEGER56_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigInteger_String57" column="HASHMAP_BIG_INTEGER57_STR">
+            <field name="HashMapOfBigInteger_String57" column="HASHMAP_BIG_INTEGER57_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigInteger_String58" column="HASHMAP_BIG_INTEGER58_STR">
+            <field name="HashMapOfBigInteger_String58" column="HASHMAP_BIG_INTEGER58_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfBigInteger_String60" column="HASHMAP_BIG_INTEGER60_STR">
+            <field name="HashMapOfBigInteger_String60" column="HASHMAP_BIG_INTEGER60_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfBigInteger_String62" table="HASHMAP_BIG_INTEGER62_STR">
                 <join column="IDENTIFIER"/>
-                <key column="BIG_INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfByte_String63" column="HASHMAP_BYTE63_STR">
+            <field name="HashMapOfByte_String63" column="HASHMAP_BYTE63_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfByte_String64" column="HASHMAP_BYTE64_STR">
+            <field name="HashMapOfByte_String64" column="HASHMAP_BYTE64_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfByte_String65" column="HASHMAP_BYTE65_STR">
+            <field name="HashMapOfByte_String65" column="HASHMAP_BYTE65_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfByte_String66" column="HASHMAP_BYTE66_STR">
+            <field name="HashMapOfByte_String66" column="HASHMAP_BYTE66_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfByte_String67" column="HASHMAP_BYTE67_STR">
+            <field name="HashMapOfByte_String67" column="HASHMAP_BYTE67_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfByte_String69" column="HASHMAP_BYTE69_STR">
+            <field name="HashMapOfByte_String69" column="HASHMAP_BYTE69_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfByte_String71" table="HASHMAP_BYTE71_STR">
                 <join column="IDENTIFIER"/>
-                <key column="BYTEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfDouble_String72" column="HASHMAP_DOUBLE72_STR">
+            <field name="HashMapOfDouble_String72" column="HASHMAP_DOUBLE72_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDouble_String73" column="HASHMAP_DOUBLE73_STR">
+            <field name="HashMapOfDouble_String73" column="HASHMAP_DOUBLE73_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDouble_String74" column="HASHMAP_DOUBLE74_STR">
+            <field name="HashMapOfDouble_String74" column="HASHMAP_DOUBLE74_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDouble_String75" column="HASHMAP_DOUBLE75_STR">
+            <field name="HashMapOfDouble_String75" column="HASHMAP_DOUBLE75_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDouble_String76" column="HASHMAP_DOUBLE76_STR">
+            <field name="HashMapOfDouble_String76" column="HASHMAP_DOUBLE76_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfDouble_String78" column="HASHMAP_DOUBLE78_STR">
+            <field name="HashMapOfDouble_String78" column="HASHMAP_DOUBLE78_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfDouble_String80" table="HASHMAP_DOUBLE80_STR">
                 <join column="IDENTIFIER"/>
-                <key column="DOUBLEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfFloat_String81" column="HASHMAP_FLOAT81_STR">
+            <field name="HashMapOfFloat_String81" column="HASHMAP_FLOAT81_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfFloat_String82" column="HASHMAP_FLOAT82_STR">
+            <field name="HashMapOfFloat_String82" column="HASHMAP_FLOAT82_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfFloat_String83" column="HASHMAP_FLOAT83_STR">
+            <field name="HashMapOfFloat_String83" column="HASHMAP_FLOAT83_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfFloat_String84" column="HASHMAP_FLOAT84_STR">
+            <field name="HashMapOfFloat_String84" column="HASHMAP_FLOAT84_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfFloat_String85" column="HASHMAP_FLOAT85_STR">
+            <field name="HashMapOfFloat_String85" column="HASHMAP_FLOAT85_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfFloat_String87" column="HASHMAP_FLOAT87_STR">
+            <field name="HashMapOfFloat_String87" column="HASHMAP_FLOAT87_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfFloat_String89" table="HASHMAP_FLOAT89_STR">
                 <join column="IDENTIFIER"/>
-                <key column="FLOATVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfInteger_String90" column="HASHMAP_INTEGER90_STR">
+            <field name="HashMapOfInteger_String90" column="HASHMAP_INTEGER90_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfInteger_String91" column="HASHMAP_INTEGER91_STR">
+            <field name="HashMapOfInteger_String91" column="HASHMAP_INTEGER91_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfInteger_String92" column="HASHMAP_INTEGER92_STR">
+            <field name="HashMapOfInteger_String92" column="HASHMAP_INTEGER92_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfInteger_String93" column="HASHMAP_INTEGER93_STR">
+            <field name="HashMapOfInteger_String93" column="HASHMAP_INTEGER93_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfInteger_String94" column="HASHMAP_INTEGER94_STR">
+            <field name="HashMapOfInteger_String94" column="HASHMAP_INTEGER94_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfInteger_String96" column="HASHMAP_INTEGER96_STR">
+            <field name="HashMapOfInteger_String96" column="HASHMAP_INTEGER96_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfInteger_String98" table="HASHMAP_INTEGER98_STR">
                 <join column="IDENTIFIER"/>
-                <key column="INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfLong_String99" column="HASHMAP_LONG99_STR">
+            <field name="HashMapOfLong_String99" column="HASHMAP_LONG99_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfLong_String100" column="HASHMAP_LONG100_STR">
+            <field name="HashMapOfLong_String100" column="HASHMAP_LONG100_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfLong_String101" column="HASHMAP_LONG101_STR">
+            <field name="HashMapOfLong_String101" column="HASHMAP_LONG101_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfLong_String102" column="HASHMAP_LONG102_STR">
+            <field name="HashMapOfLong_String102" column="HASHMAP_LONG102_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfLong_String103" column="HASHMAP_LONG103_STR">
+            <field name="HashMapOfLong_String103" column="HASHMAP_LONG103_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfLong_String105" column="HASHMAP_LONG105_STR">
+            <field name="HashMapOfLong_String105" column="HASHMAP_LONG105_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfLong_String107" table="HASHMAP_LONG107_STR">
                 <join column="IDENTIFIER"/>
-                <key column="LONGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfShort_String108" column="HASHMAP_SHORT108_STR">
+            <field name="HashMapOfShort_String108" column="HASHMAP_SHORT108_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfShort_String109" column="HASHMAP_SHORT109_STR">
+            <field name="HashMapOfShort_String109" column="HASHMAP_SHORT109_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfShort_String110" column="HASHMAP_SHORT110_STR">
+            <field name="HashMapOfShort_String110" column="HASHMAP_SHORT110_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfShort_String111" column="HASHMAP_SHORT111_STR">
+            <field name="HashMapOfShort_String111" column="HASHMAP_SHORT111_STR"
+                   serialized="true">
             </field>
-            <field name="HashMapOfShort_String112" column="HASHMAP_SHORT112_STR">
+            <field name="HashMapOfShort_String112" column="HASHMAP_SHORT112_STR"
+                   serialized="true">
             </field>
             <field name="HashMapOfShort_String114" column="HASHMAP_SHORT114_STR">
             </field>
             <field name="HashMapOfShort_String116" table="HASHMAP_SHORT116_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SHORTVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
         </class>



Mime
View raw message