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 [5/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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -5,319 +5,393 @@
         <class name="HashtableStringKeyCollections" table="HASHTABLESTRINGKEY_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
-            <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="From jdo-commits-return-774-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Tue Jul 26 20:19:09 2005
Return-Path: <jdo-commits-return-774-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 452 invoked from network); 26 Jul 2005 20:19:08 -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:08 -0000
Received: (qmail 94310 invoked by uid 500); 26 Jul 2005 20:19:06 -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 94296 invoked by uid 99); 26 Jul 2005 20:19:06 -0000
X-ASF-Spam-Status: No, hits=-9.6 requirHASHTBL_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">
+            <field name="HashtableOfString_SimpleInterface7" table="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">
+            <field name="HashtableOfString_SimpleInterface8" table="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">
+            <ed=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:55 -0700
Received: (qmail 339 invoked by uid 65534); 26 Jul 2005 20:18:51 -0000
Message-ID: <20050726201851.338.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r225384 [4/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

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypesfield 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">
             <//HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -7,317 +7,391 @@
             <field name="identifier" column="IDENTIFIER"/>
             <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 namefield>
-            <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 na="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">
            me="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">
              <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">
                 <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">
+                <join column="IDENTIFIER"/>    </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="SIM
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface8" column="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_String1PCLSREF"/>
                 <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_OF1" 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_Locale16From jdo-commits-return-773-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Tue Jul 26 20:19:09 2005
Return-Path: <jdo-commits-return-773-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 451 invoked from network); 26 Jul 2005 20:19:08 -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:08 -0000
Received: (qmail 94213 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 94155 invoked by uid 99); 26 Jul 2005 20:19:04 -0000
X-ASF-Spam-Status: No, hits=-9.6 requir_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">
 " 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_ed=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:53 -0700
Received: (qmail 336 invoked by uid 65534); 26 Jul 2005 20:18:51 -0000
Message-ID: <20050726201851.335.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r225384 [3/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

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtyp            </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="HASHTBLBigDecimal20" 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"
+                   seriaes/MapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -6,317 +6,391 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <f_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_Byte67lized="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">
+            <fieield name="MapOfString_Object1" table="MAP_OF_STRING_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object2" table="MAP_OF_STRING_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass3" table="MAP_OF_STRING_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass4" table="MAP_OF_STRING_SIMPLE_CLASS4">
           From jdo-commits-return-776-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Tue Jul 26 20:19:09 2005
Return-Path: <jdo-commits-return-776-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 457 invoked from network); 26 Jul 2005 20:19:08 -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:08 -0000
Received: (qmail 94366 invoked by uid 500); 26 Jul 2005 20:19:07 -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 94338 invoked by uid 99); 26 Jul 2005 20:19:07 -0000
X-ASF-Spam-Status: No, hits=-9.6 requir" 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 nld 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">
                 <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 name="HashMapOfString_String51" column="HASHMAP_STR_STRING51"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_String52" column="HASHMAP_STR_STRING52">
+            <field name="HashMapOfString_String52" column="HASHMAP_STR_STRING52"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Date54" column="HASHMAP_STR_DATE54">
+            <field name="HashMapOfString_Date54" column="HASHMAP_STR_DATE54"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Date55" column="HASHMAP_STR_DATE55">
+            <field name="HashMapOfString_Date55" column="HASHMAP_STR_DATE55"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Locale57" column="HASHMAP_STR_LOCALE57">
+            <field name="HashMapOfString_Locale57" column="HASHMAP_STR_LOCALE57"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Locale58" column="HASHMAP_STR_LOCALE58">
+            <field name="HashMapOfString_Locale58" column="HASHMAP_STR_LOCALE58"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigDecimal60" column="HASHMAP_STR_BIG_DECIMAL60">
+            <field name="HashMapOfString_BigDecimal60" column="HASHMAP_STR_BIG_DECIMAL60"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigDecimal61" column="HASHMAP_STR_BIG_DECIMAL61">
+            <field name="HashMapOfString_BigDecimal61" column="HASHMAP_STR_BIG_DECIMAL61"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigInteger63" column="HASHMAP_STR_BIG_INTEGER63">
+            <field name="HashMapOfString_BigInteger63" column="HASHMAP_STR_BIG_INTEGER63"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_BigInteger64" column="HASHMAP_STR_BIG_INTEGER64">
+            <field name="HashMapOfString_BigInteger64" column="HASHMAP_STR_BIG_INTEGER64"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Byte66" column="HASHMAP_STR_BYTE66">
+            <field name="HashMap      <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass5" table="MAP_OF_STRING_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface6" table="MAP_OF_STRING_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface7" column="MAP_OF_STRING_SIMPLE_INTERFACE7">
+                <join column="IDENTIFIER"/>
+   ed=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:55 -0700
Received: (qmail 351 invoked by uid 65534); 26 Jul 2005 20:18:52 -0000
Message-ID: <20050726201852.350.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r225384 [6/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

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypesOfString_Byte66" column="HASHMAP_STR_BYTE66"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Byte67" column="HASHMAP_STR_BYTE67">
+            <field name="HashMapOfString_Byte67" column="HASHMAP_STR_BYTE67"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Double69" column="HASHMAP_STR_DOUBLE69">
+            <field name="HashMapOfString_Double69" column="HASHMAP_STR_DOUBLE69"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Double70" column="HASHMAP_STR_DOUBLE70">
+            <field name="HashMapOfString_Double70" column="HASHMAP_STR_DOUBLE70"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Float72" column="HASHMAP_STR_FLOAT72">
+            <field name="HashMapOfString_Float72" column="HASHMAP_STR_FLOAT72"
+                   serialized="true">
             </field>
-            <field name="ame="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_Short8             <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="MapOfString_SimpleInterface8" column="MAP_OF_STRING_SIMPLE_INTERFACE8">
+            <field name="MapOfString_SimpleInterface8" column="MAP_OF_STRING_SIMPLE_INTERFACE8" >
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String9" column="MAP_OF_STRING_STRING9">
+            <field name="MapOfString_String9" column="MAP_OF_STRING_STRING9"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String10" column="MAP_OF_STRING_STRING10">
+            <field name="MapOfString_String10" column="MAP_OF_STRING_STRING10"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String11" /MapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -7,317 +7,391 @@
             <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_ObjeHashMapOfString_Float73" column="HASHMAP_STR_FLOAT73">
+            <field name="HashMapOfString_Float73" column="HASHMAP_STR_FLOAT73"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Integer75" column="HASHMAP_STR_INTEGER75">
+            <field name="HashMapOfString_Integer75" column="HASHMAP_STR_INTEGER75"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Integer76" column="HASHMAP_STR_INTEGER76">
+            <field name="HashMapOfString_Integer76" column="HASHMAP_STR_INTEGER76"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Long78" column="HASHMAP_STR_LONG78">
+            <field name="HashMapOfString_Long78" column="HASHMAP_STR_LONG78"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Long79" column="HASHMAP_STR_LONG79">
+            <field name="HashMapOfString_Long79" column="HASHMAP_STR_L1" 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"/>
        column="MAP_OF_STRING_STRING11">
+            <field name="MapOfString_String11" column="MAP_OF_STRING_STRING11"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date12" column="MAP_OF_STRING_DATE12">
+            <field name="MapOfString_Date12" column="MAP_OF_STRING_DATE12"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date13" column="MAP_OF_STRING_DATE13">
+            <field name="MapOfString_Date13" column="MAP_OF_STRING_DATE13"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date14" column="MAP_OF_STRING_DATE14">
+            <field name="MapOfString_Date14" column="MAP_OF_STRING_DATE14"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale15" column="MAP_OF_STRING_LOCALE15">
+            <field name="MapOfString_Locale15" column="MAP_OF_STRING_LOCALE15"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale16" column="MAP_OF_STRING_LOCALE16">
+            <field name="MapOfString_Locale16" column="MAP_OF_STRING_LOCALE16"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale17" column="MAP_OF_STRING_LOCALE17">
+            <field name="MapOfString_Locale17" column="MAP_OF_STRING_LOCALE17"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal18" column="MAP_OF_STRING_BIG_DECIMAL18">
+            <field name="MapOfString_BigDecimal18" column="MAP_OF_STRING_BIG_DECIMAL18"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal19" column="MAP_OF_STRING_BIG_DECIMAL19">
+            <field name="MapOfString_BigDecimal19" column="MAP_OF_STRING_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal20" column="MAP_OF_STRING_BIG_DECIMAL2ct1" table="MAP_OF_STRING_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object2" table="MAP_OF_STRING_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass3" table="MAP_OF_STRING_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass4" table="MAP_OF_STRING_SIMPLE_CLASS4">
                 <join column="IDENTIFONG79"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Short81" column="HASHMAP_STR_SHORT81">
+            <field name="HashMapOfString_Short81" column="HASHMAP_STR_SHORT81"
+                   serialized="true">
             </field>
-            <field name="HashMapOfString_Short82" column="HASHMAP_STR_SHORT82">
+            <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="KEY         <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="HAS0">
+            <field name="MapOfString_BigDecimal20" column="MAP_OF_STRING_BIG_DECIMAL20"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger21" column="MAP_OF_STRING_BIG_INTEGER21">
+            <field name="MapOfString_BigInteger21" column="MAP_OF_STRING_BIG_INTEGER21"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger22" column="MAP_OF_STRING_BIG_INTEGER22">
+            <field name="MapOfString_BigInteger22" column="MAP_OF_STRING_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger23" column="MAP_OF_STRING_BIG_INTEGER23">
+            <field name="MapOfString_BigInteger23" column="MAP_OF_STRING_BIG_INTEGER23"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte24" column="MAP_OF_STRING_BYTE24">
+            <field name="MapOfString_Byte24" column="MAP_OF_STRING_BYTE2IER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass5" table="MAP_OF_STRING_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface6" table="MAP_OF_STRING_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface7" column="MAP_OF_STRING_SIMPLE_INTERFACE7">
+                <join column="IDENTIFIER"/>
+                <key column="KVAL"/>
                 <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="HTBL_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">
   4"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte25" column="MAP_OF_STRING_BYTE25">
+            <field name="MapOfString_Byte25" column="MAP_OF_STRING_BYTE25"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte26" column="MAP_OF_STRING_BYTE26">
+            <field name="MapOfString_Byte26" column="MAP_OF_STRING_BYTE26"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double27" column="MAP_OF_STRING_DOUBLE27">
+            <field name="MapOfString_Double27" column="MAP_OF_STRING_DOUBLE27"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double28" column="MAP_OF_STRING_DOUBLE28">
+            <field name="MapOfString_Double28" column="MAP_OF_STRING_DOUBLE28"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double29" column="MAP_OF_STRING_DOUBLE29">
+      EYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface8" column="MAP_OF_STRING_SIMPLE_INTERFACE8">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String9" column="MAP_OF_STRING_STRING9">
+            <field name="MapOfString_String9" column="MAP_OF_STRING_STRING9"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String10" column="MAP_OF_STRING_STRING10">
+            <field name="MapOfString_String10" column="MAP_OF_STRING_STRING10"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String11" column="MAP_OF_STRING_STRING11">
+            <field name="MapOfString_String11" column="MAP_OF_STRING_STRING11"
+            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="          </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"/>
         <field name="MapOfString_Double29" column="MAP_OF_STRING_DOUBLE29"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float30" column="MAP_OF_STRING_FLOAT30">
+            <field name="MapOfString_Float30" column="MAP_OF_STRING_FLOAT30"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float31" column="MAP_OF_STRING_FLOAT31">
+            <field name="MapOfString_Float31" column="MAP_OF_STRING_FLOAT31"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float32" column="MAP_OF_STRING_FLOAT32">
+            <field name="MapOfString_Float32" column="MAP_OF_STRING_FLOAT32"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer33" column="MAP_OF_STRING_INTEGER33">
+            <field name="MapOfString_Integer33" column="MAP_OF_STRING_INTEGER33"
+                   serialized="true">
             </field>
-                serialized="true">
             </field>
-            <field name="MapOfString_Date12" column="MAP_OF_STRING_DATE12">
+            <field name="MapOfString_Date12" column="MAP_OF_STRING_DATE12"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date13" column="MAP_OF_STRING_DATE13">
+            <field name="MapOfString_Date13" column="MAP_OF_STRING_DATE13"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date14" column="MAP_OF_STRING_DATE14">
+            <field name="MapOfString_Date14" column="MAP_OF_STRING_DATE14"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale15" column="MAP_OF_STRING_LOCALE15">
+            <field name="MapOfString_Locale15" column="MAP_OF_STRING_LOCALE15"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale16" column="MAP_OF_STRING_LOCALE16">
+            <field name="MapOfHashMapOfString_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"/>              <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_   <field name="MapOfString_Integer34" column="MAP_OF_STRING_INTEGER34">
+            <field name="MapOfString_Integer34" column="MAP_OF_STRING_INTEGER34"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer35" column="MAP_OF_STRING_INTEGER35">
+            <field name="MapOfString_Integer35" column="MAP_OF_STRING_INTEGER35"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long36" column="MAP_OF_STRING_LONG36">
+            <field name="MapOfString_Long36" column="MAP_OF_STRING_LONG36"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long37" column="MAP_OF_STRING_LONG37">
+            <field name="MapOfString_Long37" column="MAP_OF_STRING_LONG37"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long38" column="MAP_OF_STRING_LONG38">
+            <field name="MapOfString_Long38" column="MAP_OF_STRING_LONG38"
+String_Locale16" column="MAP_OF_STRING_LOCALE16"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale17" column="MAP_OF_STRING_LOCALE17">
+            <field name="MapOfString_Locale17" column="MAP_OF_STRING_LOCALE17"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal18" column="MAP_OF_STRING_BIG_DECIMAL18">
+            <field name="MapOfString_BigDecimal18" column="MAP_OF_STRING_BIG_DECIMAL18"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal19" column="MAP_OF_STRING_BIG_DECIMAL19">
+            <field name="MapOfString_BigDecimal19" column="MAP_OF_STRING_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal20" column="MAP_OF_STRING_BIG_DECIMAL20">
+            <field name="MapOfString_BigDecimal20" column="MAP_OF_STRING_BIG_DECIMAL20"
+                   serialized="t
+                <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" column="HASHMAP_STR_DOUBLE111"
+                   serialized="true">
             </field>
             <field name="HashMapOfString_Double113" table="HASHMAP_STR_DOUBLE113">
                 <join 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 name="HashtableOfString_BigInteger105" column="HASHTBL_STR_BIG_INTEGER105"
+                   serialized="true">
             </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 name="HashtableOfString_Byte108" column="HASHTBL_STR_BYTE108"
+                   serialized="true">
             </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=                   serialized="true">
             </field>
-            <field name="MapOfString_Short39" column="MAP_OF_STRING_SHORT39">
+            <field name="MapOfString_Short39" column="MAP_OF_STRING_SHORT39"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short40" column="MAP_OF_STRING_SHORT40">
+            <field name="MapOfString_Short40" column="MAP_OF_STRING_SHORT40"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short41" column="MAP_OF_STRING_SHORT41">
+            <field name="MapOfString_Short41" column="MAP_OF_STRING_SHORT41"
+                   serialized="true">
             </field>
   <field name="MapOfString_Object42" table="MAP_OF_STRING_OBJECT42">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
          rue">
             </field>
-            <field name="MapOfString_BigInteger21" column="MAP_OF_STRING_BIG_INTEGER21">
+            <field name="MapOfString_BigInteger21" column="MAP_OF_STRING_BIG_INTEGER21"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger22" column="MAP_OF_STRING_BIG_INTEGER22">
+            <field name="MapOfString_BigInteger22" column="MAP_OF_STRING_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger23" column="MAP_OF_STRING_BIG_INTEGER23">
+            <field name="MapOfString_BigInteger23" column="MAP_OF_STRING_BIG_INTEGER23"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte24" column="MAP_OF_STRING_BYTE24">
+            <field name="MapOfString_Byte24" column="MAP_OF_STRING_BYTE24"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte25" column="MAP_OF_Scolumn="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"
+                   serialized="true">
             </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="HashMapOfStrin"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_   <field name="MapOfString_Object43" table="MAP_OF_STRING_OBJECT43">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass45" table="MAP_OF_STRING_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass46" table="MAP_OF_STRING_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface48" table="MAP_OF_STRTRING_BYTE25">
+            <field name="MapOfString_Byte25" column="MAP_OF_STRING_BYTE25"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte26" column="MAP_OF_STRING_BYTE27">
+            <field name="MapOfString_Byte26" column="MAP_OF_STRING_BYTE26"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double27" column="MAP_OF_STRING_DOUBLE27">
+            <field name="MapOfString_Double27" column="MAP_OF_STRING_DOUBLE27"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double28" column="MAP_OF_STRING_DOUBLE28">
+            <field name="MapOfString_Double28" column="MAP_OF_STRING_DOUBLE28"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double29" column="MAP_OF_STRING_DOUBLE29">
+            <field name="MapOfString_Double29" column="MAP_OF_STRING_DOUBLE29"
+                   serialized="true">
             <g_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" column="HASHMAP_STR_LONG120"
+                   serialized="true">
             </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">
       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 columnING_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface49" table="MAP_OF_STRING_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String51" column="MAP_OF_STRING_STRING51">
+            <field name="MapOfString_String51" column="MAP_OF_STRING_STRING51"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String52" column="MAP_OF_STRING_STRING52">
+            <field name="MapOfString_String52" column="MAP_OF_STRING_STRING52"
+                   serialized="true">
          /field>
-            <field name="MapOfString_Float30" column="MAP_OF_STRING_FLOAT30">
+            <field name="MapOfString_Float30" column="MAP_OF_STRING_FLOAT30"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float31" column="MAP_OF_STRING_FLOAT31">
+            <field name="MapOfString_Float31" column="MAP_OF_STRING_FLOAT31"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float32" column="MAP_OF_STRING_FLOAT32">
+            <field name="MapOfString_Float32" column="MAP_OF_STRING_FLOAT32"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer33" column="MAP_OF_STRING_INTEGER33">
+            <field name="MapOfString_Integer33" column="MAP_OF_STRING_INTEGER33"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer34" column="MAP_OF_STRING_INTEGER34">
+            <field name="MapOfString_Integer34" colu      </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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Tue Ju="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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStri   </field>
-            <field name="MapOfString_Date54" column="MAP_OF_STRING_DATE54">
+            <field name="MapOfString_Date54" column="MAP_OF_STRING_DATE54"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date55" column="MAP_OF_STRING_DATE55">
+            <field name="MapOfString_Date55" column="MAP_OF_STRING_DATE55"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale57" column="MAP_OF_STRING_LOCALE57">
+            <field name="MapOfString_Locale57" column="MAP_OF_STRING_LOCALE57"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale58" column="MAP_OF_STRING_LOCALE58">
+            <field name="MapOfString_Locale58" column="MAP_OF_STRING_LOCALE58"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal60" column="MAP_OF_STRING_BIG_DECIMAL60">
+            <field name="MapOfString_BigDecimal60mn="MAP_OF_STRING_INTEGER34"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer35" column="MAP_OF_STRING_INTEGER35">
+            <field name="MapOfString_Integer35" column="MAP_OF_STRING_INTEGER35"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long36" column="MAP_OF_STRING_LONG36">
+            <field name="MapOfString_Long36" column="MAP_OF_STRING_LONG36"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long37" column="MAP_OF_STRING_LONG37">
+            <field name="MapOfString_Long37" column="MAP_OF_STRING_LONG37"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long38" column="MAP_OF_STRING_LONG38">
+            <field name="MapOfString_Long38" column="MAP_OF_STRING_LONG38"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short39" column="MAP_OF_STRIl 26 13:17:23 2005
@@ -7,310 +7,370 @@
             <field name="identifier" column="IDENTIFIER"/>
             <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"/>
+         ngValueCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -7,310 +7,370 @@
             <field name="identifier" column="IDENTIFIER"/>
             <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"/>
-           " column="MAP_OF_STRING_BIG_DECIMAL60"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal61" column="MAP_OF_STRING_BIG_DECIMAL61">
+            <field name="MapOfString_BigDecimal61" column="MAP_OF_STRING_BIG_DECIMAL61"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger63" column="MAP_OF_STRING_BIG_INTEGER63">
+            <field name="MapOfString_BigInteger63" column="MAP_OF_STRING_BIG_INTEGER63"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger64" column="MAP_OF_STRING_BIG_INTEGER64">
+            <field name="MapOfString_BigInteger64" column="MAP_OF_STRING_BIG_INTEGER64"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte66" column="MAP_OF_STRING_BYTE66">
+            <field name="MapOfString_Byte66" column="MAP_OF_STRING_BYTE66"
+                   serialized="true">
            NG_SHORT39">
+            <field name="MapOfString_Short39" column="MAP_OF_STRING_SHORT39"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short40" column="MAP_OF_STRING_SHORT40">
+            <field name="MapOfString_Short40" column="MAP_OF_STRING_SHORT40"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short41" column="MAP_OF_STRING_SHORT41">
+            <field name="MapOfString_Short41" column="MAP_OF_STRING_SHORT41"
+                   serialized="true">
             </field>
   <field name="MapOfString_Object42" table="MAP_OF_STRING_OBJECT42">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object43" table="MAP_OF_STRING_OBJECT43">
                 <join column="IDENTIFIER"/>
-                 <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"/>
-                  <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">
              </field>
-            <field name="MapOfString_Byte67" column="MAP_OF_STRING_BYTE67">
+            <field name="MapOfString_Byte67" column="MAP_OF_STRING_BYTE67"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double69" column="MAP_OF_STRING_DOUBLE69">
+            <field name="MapOfString_Double69" column="MAP_OF_STRING_DOUBLE69"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double70" column="MAP_OF_STRING_DOUBLE70">
+            <field name="MapOfString_Double70" column="MAP_OF_STRING_DOUBLE70"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float72" column="MAP_OF_STRING_FLOAT72">
+            <field name="MapOfString_Float72" column="MAP_OF_STRING_FLOAT72"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float73" column="MAP_OF_STRING_FLOAT73">
+            <field name="MapOfString_Float73" column="MAP_      <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass45" table="MAP_OF_STRING_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass46" table="MAP_OF_STRING_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface48" table="MAP_OF_STRING_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                  <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="ID    <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_StOF_STRING_FLOAT73"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer75" column="MAP_OF_STRING_INTEGER75">
+            <field name="MapOfString_Integer75" column="MAP_OF_STRING_INTEGER75"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer76" column="MAP_OF_STRING_INTEGER76">
+            <field name="MapOfString_Integer76" column="MAP_OF_STRING_INTEGER76"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long78" column="MAP_OF_STRING_LONG78">
+            <field name="MapOfString_Long78" column="MAP_OF_STRING_LONG78"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long79" column="MAP_OF_STRING_LONG79">
+            <field name="MapOfString_Long79" column="MAP_OF_STRING_LONG79"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short81" column="MAP_OF_ST <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface49" table="MAP_OF_STRING_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String51" column="MAP_OF_STRING_STRING51">
+            <field name="MapOfString_String51" column="MAP_OF_STRING_STRING51"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String52" column="MAP_OF_STRING_STRING52">
+            <field name="MapOfString_String52" column="MAP_OF_STRING_STRING52"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date54" column="MAP_OF_STRING_DATE54">
+            <field name="MapOfStringENTIFIER"/>
-                <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="HashMapOfSiring9" 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="KEYREF"/>
+                <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="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <ordRING_SHORT81">
+            <field name="MapOfString_Short81" column="MAP_OF_STRING_SHORT81"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short82" column="MAP_OF_STRING_SHORT82">
+            <field name="MapOfString_Short82" column="MAP_OF_STRING_SHORT82"
+                   serialized="true">
             </field>
             <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object86" table="MAP_OF_STRING_OBJECT86">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfS_Date54" column="MAP_OF_STRING_DATE54"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Date55" column="MAP_OF_STRING_DATE55">
+            <field name="MapOfString_Date55" column="MAP_OF_STRING_DATE55"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale57" column="MAP_OF_STRING_LOCALE57">
+            <field name="MapOfString_Locale57" column="MAP_OF_STRING_LOCALE57"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Locale58" column="MAP_OF_STRING_LOCALE58">
+            <field name="MapOfString_Locale58" column="MAP_OF_STRING_LOCALE58"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigDecimal60" column="MAP_OF_STRING_BIG_DECIMAL60">
+            <field name="MapOfString_BigDecimal60" column="MAP_OF_STRING_BIG_DECIMAL60"
+                   serialized="true">
             </field>
-            <field name="mpleClass_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"/>
           er column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String12" table="HASHTBL_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <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="KEYREF"/>
+                <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"/>
+         tring_SimpleClass87" table="MAP_OF_STRING_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass89" table="MAP_OF_STRING_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface90" table="MAP_OF_STRING_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface92" table="MAP_OF_STMapOfString_BigDecimal61" column="MAP_OF_STRING_BIG_DECIMAL61">
+            <field name="MapOfString_BigDecimal61" column="MAP_OF_STRING_BIG_DECIMAL61"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger63" column="MAP_OF_STRING_BIG_INTEGER63">
+            <field name="MapOfString_BigInteger63" column="MAP_OF_STRING_BIG_INTEGER63"
+                   serialized="true">
             </field>
-            <field name="MapOfString_BigInteger64" column="MAP_OF_STRING_BIG_INTEGER64">
+            <field name="MapOfString_BigInteger64" column="MAP_OF_STRING_BIG_INTEGER64"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte66" column="MAP_OF_STRING_BYTE66">
+            <field name="MapOfString_Byte66" column="MAP_OF_STRING_BYTE66"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Byte67" column="MAP_OF_STRING_BYTE67">
+            <field name="MapOfString_B      <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        <key column="KEYREF"/>
+                <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="KEYREF"/>
+                <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="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String19" table="HASHTBL_SIMPLE_INTERFACE19_STR">
                 <join column=RING_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String93" column="MAP_OF_STRING_STRING93">
+            <field name="MapOfString_String93" column="MAP_OF_STRING_STRING93"
+                   serialized="true">
             </field>
             <field name="MapOfString_String95" table="MAP_OF_STRING_STRING95">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
+                <key column="KEYVAL"/>
+                <value column="KEYVALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Date96" column="MAP_OF_STRING_DATE96">
+            <field name="MapOfString_Date96" column="MAP_OF_STRING_DATE96"
+                   serialized=yte67" column="MAP_OF_STRING_BYTE67"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double69" column="MAP_OF_STRING_DOUBLE69">
+            <field name="MapOfString_Double69" column="MAP_OF_STRING_DOUBLE69"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Double70" column="MAP_OF_STRING_DOUBLE70">
+            <field name="MapOfString_Double70" column="MAP_OF_STRING_DOUBLE70"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float72" column="MAP_OF_STRING_FLOAT72">
+            <field name="MapOfString_Float72" column="MAP_OF_STRING_FLOAT72"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Float73" column="MAP_OF_STRING_FLOAT73">
+            <field name="MapOfString_Float73" column="MAP_OF_STRING_FLOAT73"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer7column="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">
"IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <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="KEYREF"/>
+                <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="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <"true">
             </field>
             <field name="MapOfString_Date98" table="MAP_OF_STRING_DATE98">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Locale99" column="MAP_OF_STRING_LOCALE99">
+            <field name="MapOfString_Locale99" column="MAP_OF_STRING_LOCALE99"
+                   serialized="true">
             </field>
             <field name="MapOfString_Locale101" table="MAP_OF_STRING_LOCALE101">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_BigDecimal102" column="MAP_OF_STRING_BIG_DECIMAL102">
+            <field name="MapOfString_BigDecimal102" colum5" column="MAP_OF_STRING_INTEGER75">
+            <field name="MapOfString_Integer75" column="MAP_OF_STRING_INTEGER75"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Integer76" column="MAP_OF_STRING_INTEGER76">
+            <field name="MapOfString_Integer76" column="MAP_OF_STRING_INTEGER76"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long78" column="MAP_OF_STRING_LONG78">
+            <field name="MapOfString_Long78" column="MAP_OF_STRING_LONG78"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Long79" column="MAP_OF_STRING_LONG79">
+            <field name="MapOfString_Long79" column="MAP_OF_STRING_LONG79"
+                   serialized="true">
             </field>
-            <field name="MapOfString_Short81" column="MAP_OF_STRING_SHORT81">
+            <field name="MapOfString_Short81" column="MAP_OF_STRING_SHORT81"
+                   serialized="t                 <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" columnfield name="HashtableOfSimpleInterface_String22" table="HASHTBL_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <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="KEYREF"/>
+                <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="KEYREF"/>
+ n="MAP_OF_STRING_BIG_DECIMAL102"
+                   serialized="true">
             </field>
             <field name="MapOfString_BigDecimal104" table="MAP_OF_STRING_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_BigInteger105" column="MAP_OF_STRING_BIG_INTEGER105">
+            <field name="MapOfString_BigInteger105" column="MAP_OF_STRING_BIG_INTEGER105"
+                   serialized="true">
             </field>
             <field name="MapOfString_BigInteger107" table="MAP_OF_STRING_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="Marue">
             </field>
-            <field name="MapOfString_Short82" column="MAP_OF_STRING_SHORT82">
+            <field name="MapOfString_Short82" column="MAP_OF_STRING_SHORT82"
+                   serialized="true">
             </field>
             <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object86" table="MAP_OF_STRING_OBJECT86">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass87" table="MAP_OF_STRING_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
-                <key ="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="HashMapOf               <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>pOfString_Byte108" column="MAP_OF_STRING_BYTE108">
+            <field name="MapOfString_Byte108" column="MAP_OF_STRING_BYTE108"
+                   serialized="true">
             </field>
             <field name="MapOfString_Byte110" table="MAP_OF_STRING_BYTE110">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Double111" column="MAP_OF_STRING_DOUBLE111">
+            <field name="MapOfString_Double111" column="MAP_OF_STRING_DOUBLE111"
+                   serialized="true">
             </field>
             <field name="MapOfString_Double113" table="MAP_OF_STRING_DOUBLE113">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
                 <order column="INDEX"/>
      column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass89" table="MAP_OF_STRING_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface90" table="MAP_OF_STRING_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface92" table="MAP_OF_STRING_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+              String_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_String
-            <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="MapOfString_Float114" column="MAP_OF_STRING_FLOAT114">
+            <field name="MapOfString_Float114" column="MAP_OF_STRING_FLOAT114"
+                   serialized="true">
             </field>
             <field name="MapOfString_Float116" table="MAP_OF_STRING_FLOAT116">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Integer117" column="MAP_OF_STRING_INTEGER117">
+            <field name="MapOfString_Integer117" column="MAP_OF_STRING_INTEGER117"
+                   serialized="true">
             </field>
             <field name="MapOfString_Integer119" table="MAP_OF_STRING_INTEGER119">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="INT  <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String93" column="MAP_OF_STRING_STRING93">
+            <field name="MapOfString_String93" column="MAP_OF_STRING_STRING93"
+                   serialized="true">
             </field>
             <field name="MapOfString_String95" table="MAP_OF_STRING_STRING95">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
+                <key column="KEYVAL"/>
+                <value column="KEYVALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Date96" column="MAP_OF_STRING_DATE96">
+            <field name="MapOfString_Date96" column="MAP_OF_STRING_DATE96"
+                   serialized="true">
             </field>
             <field name="MapOfString_Date98" table="MAP_OF_STRING_DATE98">
                 <jo39" 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=           </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="HashtableEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Long120" column="MAP_OF_STRING_LONG120">
+            <field name="MapOfString_Long120" column="MAP_OF_STRING_LONG120"
+                   serialized="true">
             </field>
             <field name="MapOfString_Long122" table="MAP_OF_STRING_LONG122">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Short123" column="MAP_OF_STRING_SHORT123">
+            <field name="MapOfString_Short123" column="MAP_OF_STRING_SHORT123"
+                   serialized="true">
             </field>
             <field name="MapOfString_Short125" table="MAP_OF_STRING_SHORT125">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVALin column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Locale99" column="MAP_OF_STRING_LOCALE99">
+            <field name="MapOfString_Locale99" column="MAP_OF_STRING_LOCALE99"
+                   serialized="true">
             </field>
             <field name="MapOfString_Locale101" table="MAP_OF_STRING_LOCALE101">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_BigDecimal102" column="MAP_OF_STRING_BIG_DECIMAL102">
+            <field name="MapOfString_BigDecimal102" column="MAP_OF_STRING_BIG_DECIMAL102"
+                   serialized="true">
             </field>
             <field name="MapOfS"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">
+            <fieldOfDate_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="H"/>
                 <value column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -6,310 +6,370 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="MapOfObject_String0" table="MAP_OF_OBJECT0_STRING">
                 <join column=tring_BigDecimal104" table="MAP_OF_STRING_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_BigInteger105" column="MAP_OF_STRING_BIG_INTEGER105">
+            <field name="MapOfString_BigInteger105" column="MAP_OF_STRING_BIG_INTEGER105"
+                   serialized="true">
             </field>
             <field name="MapOfString_BigInteger107" table="MAP_OF_STRING_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Byte108" column="MAP_OF_STRING_BYTE108">
+            <field name="MapOfString_Byte108" column="MAP_OF_STRING_BYTE10 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" jdbc-type="DECIMAL" length="11" scale="4"/>
+                    <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="HashMapOfBigIntASHTBL_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">
      "IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String1" table="MAP_OF_OBJECT1_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String2" table="MAP_OF_OBJECT2_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String3" table="MAP_OF_OBJECT3_STRING"8"
+                   serialized="true">
             </field>
             <field name="MapOfString_Byte110" table="MAP_OF_STRING_BYTE110">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Double111" column="MAP_OF_STRING_DOUBLE111">
+            <field name="MapOfString_Double111" column="MAP_OF_STRING_DOUBLE111"
+                   serialized="true">
             </field>
             <field name="MapOfString_Double113" table="MAP_OF_STRING_DOUBLE113">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Float114" column="MAP_OF_STRING_FLOAT114">
+            <field name="Mapeger_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           <join column="IDENTIFIER"/>
                 <key>
-                    <column name="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                    <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">
+            <fie>
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String4" table="MAP_OF_OBJECT4_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String6" table="MAP_OF_OBJECT6_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_StringOfString_Float114" column="MAP_OF_STRING_FLOAT114"
+                   serialized="true">
             </field>
             <field name="MapOfString_Float116" table="MAP_OF_STRING_FLOAT116">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Integer117" column="MAP_OF_STRING_INTEGER117">
+            <field name="MapOfString_Integer117" column="MAP_OF_STRING_INTEGER117"
+                   serialized="true">
             </field>
             <field name="MapOfString_Integer119" table="MAP_OF_STRING_INTEGER119">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Long120" colum"
+                   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_String6ld 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"/>
-    8" table="MAP_OF_OBJECT8_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String9" table="MAP_OF_SIMPLE_CLASS9_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String10" table="MAP_OF_SIMPLE_CLASS10_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
  n="MAP_OF_STRING_LONG120">
+            <field name="MapOfString_Long120" column="MAP_OF_STRING_LONG120"
+                   serialized="true">
             </field>
             <field name="MapOfString_Long122" table="MAP_OF_STRING_LONG122">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Short123" column="MAP_OF_STRING_SHORT123">
+            <field name="MapOfString_Short123" column="MAP_OF_STRING_SHORT123"
+                   serialized="true">
             </field>
             <field name="MapOfString_Short125" table="MAP_OF_STRING_SHORT125">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>

Modified: incu4" 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="HAS            <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_Str           </field>
             <field name="MapOfSimpleClass_String11" table="MAP_OF_SIMPLE_CLASS11_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String12" table="MAP_OF_SIMPLE_CLASS12_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String13" table="MAP_OF_SIMPLE_CLASS13_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+   bator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -7,310 +7,370 @@
             <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfObject_String0" table="MAP_OF_OBJECT0_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+               HMAP_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" cing66" 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_             <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String15" table="MAP_OF_SIMPLE_CLASS15_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String17" table="MAP_OF_SIMPLE_CLASS17_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String18" table="MAP_OF_SIMPLE_INTERFACE18_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTRE <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String1" table="MAP_OF_OBJECT1_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String2" table="MAP_OF_OBJECT2_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String3" table="MAP_OF_OBJECT3_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key coolumn="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="HashMapOfFloatString72" 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>
-  F"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String19" table="MAP_OF_SIMPLE_INTERFACE19_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String20" table="MAP_OF_SIMPLE_INTERFACE20_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String21" table="MAP_OF_SIMPLlumn="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String4" table="MAP_OF_OBJECT4_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String6" table="MAP_OF_OBJECT6_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String8" table="MAP_OF_OBJECT8_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="ST_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"
+          <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">
      RING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String9" table="MAP_OF_SIMPLE_CLASS9_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String10" table="MAP_OF_SIMPLE_CLASS10_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String11" table="MAP_OF_SIMPLE_CLASS11_STRING">
                 <join column="IDENTIFIER"E_INTERFACE21_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String22" table="MAP_OF_SIMPLE_INTERFACE22_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String24" table="MAP_OF_SIMPLE_INTERFACE24_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="                   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_S       </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/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String12" table="MAP_OF_SIMPLE_CLASS12_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String13" table="MAP_OF_SIMPLE_CLASS13_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String1INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String26" table="MAP_OF_SIMPLE_INTERFACE26_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING">
+            <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String28" column="MAP_OF_STRING28_STRING">
+            <field name="MapOfString_String28" column="MAP_OF_STRING28_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String29" column="MAP_OF_STRING29_STRING">
+            <field name="MapOfString_String29" column="MAP_OF_STRING29_STRING"
+          tring98" 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_Stri 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="HASHT5" table="MAP_OF_SIMPLE_CLASS15_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String17" table="MAP_OF_SIMPLE_CLASS17_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String18" table="MAP_OF_SIMPLE_INTERFACE18_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <orde         serialized="true">
             </field>
-            <field name="MapOfString_String30" column="MAP_OF_STRING30_STRING">
+            <field name="MapOfString_String30" column="MAP_OF_STRING30_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String31" column="MAP_OF_STRING31_STRING">
+            <field name="MapOfString_String31" column="MAP_OF_STRING31_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String33" column="MAP_OF_STRING33_STRING">
+            <field name="MapOfString_String33" column="MAP_OF_STRING33_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfString_String35" table="MAP_OF_STRING35_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="STRINGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
              ng102" 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_StringBL_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="r column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String19" table="MAP_OF_SIMPLE_INTERFACE19_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String20" table="MAP_OF_SIMPLE_INTERFACE20_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String21" table="MAP_OF_SIMPLE_INTERFACE21_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>   <order column="INDEX"/>
             </field>
-            <field name="MapOfDate_String36" column="MAP_OF_DATE36_STRING">
+            <field name="MapOfDate_String36" column="MAP_OF_DATE36_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String37" column="MAP_OF_DATE37_STRING">
+            <field name="MapOfDate_String37" column="MAP_OF_DATE37_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String38" column="MAP_OF_DATE38_STRING">
+            <field name="MapOfDate_String38" column="MAP_OF_DATE38_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String39" column="MAP_OF_DATE39_STRING">
+            <field name="MapOfDate_String39" column="MAP_OF_DATE39_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String40" column="MAP_OF_DATE40_STRING">
+            <field name="MapOfDate_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"
+ 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="HASHTB
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String22" table="MAP_OF_SIMPLE_INTERFACE22_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String24" table="MAP_OF_SIMPLE_INTERFACE24_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String26" table="MAP_OF_SIMPLE_INTERFACE26_STRING">
                 <join 40" column="MAP_OF_DATE40_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String42" column="MAP_OF_DATE42_STRING">
+            <field name="MapOfDate_String42" column="MAP_OF_DATE42_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfDate_String44" table="MAP_OF_DATE44_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="DATEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING">
+            <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String46" column="MAP_OF_BIG_DECIMAL46_STRING">
+            <field name="MapOfBig                  serialized="true">
             </field>
-            <field name="HashMapOfShort_String114" column="HASHMAP_SHORT114_STR">
+            <field name="HashMapOfShort_String114" column="HASHMAP_SHORT114_STR"
+                   serialized="true">
             </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>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================L_LONG103_STR"
+                   serialized="true">
             </field>
-            <field name="HashtableOfLong_String105" column="HASHTBL_LONG105_STR">
+            <field name="HashtableOfLong_String105" column="HASHTBL_LONG105_STR"
+                   serialized="true">
             </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_String1column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING">
+            <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String28" column="MAP_OF_STRING28_STRING">
+            <field name="MapOfString_String28" column="MAP_OF_STRING28_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String29" column="MAP_OF_STRING29_STRING">
+            <field name="MapOfString_String29" column="MAP_OF_STRING29_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String30" column="MAP_OF_STRING30_STRING">
+            <field naDecimal_String46" column="MAP_OF_BIG_DECIMAL46_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String47" column="MAP_OF_BIG_DECIMAL47_STRING">
+            <field name="MapOfBigDecimal_String47" column="MAP_OF_BIG_DECIMAL47_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String48" column="MAP_OF_BIG_DECIMAL48_STRING">
+            <field name="MapOfBigDecimal_String48" column="MAP_OF_BIG_DECIMAL48_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String49" column="MAP_OF_BIG_DECIMAL49_STRING">
+            <field name="MapOfBigDecimal_String49" column="MAP_OF_BIG_DECIMAL49_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String51" column="MAP_OF_BIG_DECIMAL51_STRING">
+            <field name="MapOfBigDecimal_String51" column="MAP_OF_BIG_DECIMAL51_STRING"
+        ================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -20,32 +20,38 @@
                 <element column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfSimpleClass3" table="HASHSET_OF_SIMPLE_CLASS3">
+            <field name="HashSetOfSimpleClass3"
+                   table="HASHSET_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfSimpleClass4" table="HASHSET_OF_SIMPLE_CLASS4">
+            <field name="HashSetOfSimpleClass4"
+                   table="HASHSET_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 09" 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>
         me="MapOfString_String30" column="MAP_OF_STRING30_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String31" column="MAP_OF_STRING31_STRING">
+            <field name="MapOfString_String31" column="MAP_OF_STRING31_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfString_String33" column="MAP_OF_STRING33_STRING">
+            <field name="MapOfString_String33" column="MAP_OF_STRING33_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfString_String35" table="MAP_OF_STRING35_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="STRINGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfDate_String36" column="MAP_OF_DATE36_STRING">
+            <field name="M           serialized="true">
             </field>
             <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
                 <join column="IDENTIFIER"/>
                 <key>
-                    <column name="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                    <column name="KEYVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 </key>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING">
+            <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String55" column="MAP_OF_BIG_INTEGER55_STRING">
+            <field name="MapOfBigInteger_String55" column="MAP_OF_BIG_INTEGER55_STRING"
+                   serialized="true">
  <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfSimpleClass5" table="HASHSET_OF_SIMPLE_CLASS5">
+            <field name="HashSetOfSimpleClass5"
+                   table="HASHSET_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfSimpleInterface6" table="HASHSET_OF_SIMPLE_INTERFACE6">
+            <field name="HashSetOfSimpleInterface6"
+                   table="HASHSET_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfSimpleInterface7" table="HASHSET_OF_SIMPLE_INTERFACE7">
+            <field name="HashSetOfSimpleInterface7"
+                   table="HASHSET_OF_SIMPLE_INTERFACE7">
                 <join colum    <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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orapOfDate_String36" column="MAP_OF_DATE36_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String37" column="MAP_OF_DATE37_STRING">
+            <field name="MapOfDate_String37" column="MAP_OF_DATE37_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String38" column="MAP_OF_DATE38_STRING">
+            <field name="MapOfDate_String38" column="MAP_OF_DATE38_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String39" column="MAP_OF_DATE39_STRING">
+            <field name="MapOfDate_String39" column="MAP_OF_DATE39_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String40" column="MAP_OF_DATE40_STRING">
+            <field name="MapOfDate_String40" column="MAP_OF_DATE40_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDate_String42" column="MAP_           </field>
-            <field name="MapOfBigInteger_String56" column="MAP_OF_BIG_INTEGER56_STRING">
+            <field name="MapOfBigInteger_String56" column="MAP_OF_BIG_INTEGER56_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String57" column="MAP_OF_BIG_INTEGER57_STRING">
+            <field name="MapOfBigInteger_String57" column="MAP_OF_BIG_INTEGER57_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String58" column="MAP_OF_BIG_INTEGER58_STRING">
+            <field name="MapOfBigInteger_String58" column="MAP_OF_BIG_INTEGER58_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String60" column="MAP_OF_BIG_INTEGER60_STRING">
+            <field name="MapOfBigInteger_String60" column="MAP_OF_BIG_INTEGER60_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfBigInteger_Stn="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfSimpleInterface8" table="HASHSET_OF_SIMPLE_INTERFACE8">
+            <field name="HashSetOfSimpleInterface8"
+                   table="HASHSET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
@@ -55,7 +61,8 @@
                 <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"/>
@@ -67,7 +74,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>m Tue Jul 26 13:17:23 2005
@@ -55,7 +55,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"/>
@@ -67,7 +68,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"/>
@@ -79,7 +81,8 @@
                 <element column="LOCALEVALOF_DATE42_STRING">
+            <field name="MapOfDate_String42" column="MAP_OF_DATE42_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfDate_String44" table="MAP_OF_DATE44_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="DATEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING">
+            <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String46" column="MAP_OF_BIG_DECIMAL46_STRING">
+            <field name="MapOfBigDecimal_String46" column="MAP_OF_BIG_DECIMAL46_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecring62" table="MAP_OF_BIG_INTEGER62_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="BIG_INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING">
+            <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String64" column="MAP_OF_BYTE64_STRING">
+            <field name="MapOfByte_String64" column="MAP_OF_BYTE64_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String65" column="MAP_OF_BYTE65_STRING">
+            <field name="MapOfByte_String65" column="MAP_OF_BYTE65_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String66" column="M
             </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"/>
@@ -79,7 +87,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"/>
@@ -89,21 +98,27 @@
             <field name="HashSetOfBigDecimal18" table="HASHSET_OF_BIG_DECIMAL18">
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="HashSetOfBigDecimal19" c"/>
                 <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"/>
@@ -91,7 +94,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"/>
@@ -103,7 +107,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column=imal_String47" column="MAP_OF_BIG_DECIMAL47_STRING">
+            <field name="MapOfBigDecimal_String47" column="MAP_OF_BIG_DECIMAL47_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String48" column="MAP_OF_BIG_DECIMAL48_STRING">
+            <field name="MapOfBigDecimal_String48" column="MAP_OF_BIG_DECIMAL48_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String49" column="MAP_OF_BIG_DECIMAL49_STRING">
+            <field name="MapOfBigDecimal_String49" column="MAP_OF_BIG_DECIMAL49_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigDecimal_String51" column="MAP_OF_BIG_DECIMAL51_STRING">
+            <field name="MapOfBigDecimal_String51" column="MAP_OF_BIG_DECIMAL51_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
            AP_OF_BYTE66_STRING">
+            <field name="MapOfByte_String66" column="MAP_OF_BYTE66_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String67" column="MAP_OF_BYTE67_STRING">
+            <field name="MapOfByte_String67" column="MAP_OF_BYTE67_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String69" column="MAP_OF_BYTE69_STRING">
+            <field name="MapOfByte_String69" column="MAP_OF_BYTE69_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfByte_String71" table="MAP_OF_BYTE71_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="BYTEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING">
+    olumn="HASHSET_OF_BIG_DECIMAL18">
+            <field name="HashSetOfBigDecimal19"
+                   column="HASHSET_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
-            <field name="HashSetOfBigDecimal20" table="HASHSET_OF_BIG_DECIMAL20">
+            <field name="HashSetOfBigDecimal20"
+                   table="HASHSET_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigInteger21" table="HASHSET_OF_BIG_INTEGER21">
+            <field name="HashSetOfBigInteger21"
+                   table="HASHSET_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22">
+            <field name="HashSetOfBigInteger22" c"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"/>
@@ -115,9 +120,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="I     <join column="IDENTIFIER"/>
                 <key>
-                    <column name="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                    <column name="KEYVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 </key>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING">
+            <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String55" column="MAP_OF_BIG_INTEGER55_STRING">
+            <field name="MapOfBigInteger_String55" column="MAP_OF_BIG_INTEGER55_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String56" column="MAP_OF_BIG_INTEGER56_STRING">
+            <field name="MapOfBigInteger_S        <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String73" column="MAP_OF_DOUBLE73_STRING">
+            <field name="MapOfDouble_String73" column="MAP_OF_DOUBLE73_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String74" column="MAP_OF_DOUBLE74_STRING">
+            <field name="MapOfDouble_String74" column="MAP_OF_DOUBLE74_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String75" column="MAP_OF_DOUBLE75_STRING">
+            <field name="MapOfDouble_String75" column="MAP_OF_DOUBLE75_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String76" column="MAP_OF_DOUBLE76_STRING">
+            <field name="MapOfDouble_String76" column="MAP_OF_DOUBLE76_STRING"
+                   serialized="true">
             </field>
olumn="HASHSET_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
-            <field name="HashSetOfBigInteger23" table="HASHSET_OF_BIG_INTEGER23">
+            <field name="HashSetOfBigInteger23"
+                   table="HASHSET_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
@@ -113,9 +128,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"/>
@@ -NDEX"/>
@@ -127,7 +133,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"/>
@@ -139,7 +146,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfFloat31" column="LINKEDLIST_OF_FLOAT31">
+            <field name="LinkedListOfFloat31" column="LINKEDLIST_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="LinkedListOfFloat32" table="LINKEDLIST_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -151,7 +159,8 @@
                 <element column="INTEGERVAL"/>
 tring56" column="MAP_OF_BIG_INTEGER56_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String57" column="MAP_OF_BIG_INTEGER57_STRING">
+            <field name="MapOfBigInteger_String57" column="MAP_OF_BIG_INTEGER57_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String58" column="MAP_OF_BIG_INTEGER58_STRING">
+            <field name="MapOfBigInteger_String58" column="MAP_OF_BIG_INTEGER58_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfBigInteger_String60" column="MAP_OF_BIG_INTEGER60_STRING">
+            <field name="MapOfBigInteger_String60" column="MAP_OF_BIG_INTEGER60_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfBigInteger_String62" table="MAP_OF_BIG_INTEGER62_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="BIG_INTEGERVAL"/>
-              -            <field name="MapOfDouble_String78" column="MAP_OF_DOUBLE78_STRING">
+            <field name="MapOfDouble_String78" column="MAP_OF_DOUBLE78_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfDouble_String80" table="MAP_OF_DOUBLE80_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="DOUBLEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING">
+            <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String82" column="MAP_OF_FLOAT82_STRING">
+            <field name="MapOfFloat_String82" column="MAP_OF_FLOAT82_STRING"
+                   serialized="true">
             </field>
-        125,7 +141,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"/>
@@ -137,7 +154,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"/>
@@ -149,7 +167,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
                        <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"/>
@@ -163,7 +172,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37">
+            <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="LinkedListOfLong38" table="LINKEDLIST_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -175,7 +185,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <fie  <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING">
+            <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String64" column="MAP_OF_BYTE64_STRING">
+            <field name="MapOfByte_String64" column="MAP_OF_BYTE64_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String65" column="MAP_OF_BYTE65_STRING">
+            <field name="MapOfByte_String65" column="MAP_OF_BYTE65_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String66" column="MAP_OF_BYTE66_STRING">
+            <field name="MapOfByte_String66" column="MAP_OF_BYTE66_STRING"
+                   serialized="true">
             </f    <field name="MapOfFloat_String83" column="MAP_OF_FLOAT83_STRING">
+            <field name="MapOfFloat_String83" column="MAP_OF_FLOAT83_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String84" column="MAP_OF_FLOAT84_STRING">
+            <field name="MapOfFloat_String84" column="MAP_OF_FLOAT84_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String85" column="MAP_OF_FLOAT85_STRING">
+            <field name="MapOfFloat_String85" column="MAP_OF_FLOAT85_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String87" column="MAP_OF_FLOAT87_STRING">
+            <field name="MapOfFloat_String87" column="MAP_OF_FLOAT87_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfFloat_String89" table="MAP_OF_FLOAT89_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="FLOATVAL     </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"/>
@@ -161,7 +180,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"/>
@@ -173,7 +193,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40">
+            <field name="Hald 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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -55,7 +55,8 @@
                 <elemenield>
-            <field name="MapOfByte_String67" column="MAP_OF_BYTE67_STRING">
+            <field name="MapOfByte_String67" column="MAP_OF_BYTE67_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfByte_String69" column="MAP_OF_BYTE69_STRING">
+            <field name="MapOfByte_String69" column="MAP_OF_BYTE69_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfByte_String71" table="MAP_OF_BYTE71_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="BYTEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING">
+            <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING"
+                   serialized="true">
             </field>
-            <fie"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING">
+            <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String91" column="MAP_OF_INTEGER91_STRING">
+            <field name="MapOfInteger_String91" column="MAP_OF_INTEGER91_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String92" column="MAP_OF_INTEGER92_STRING">
+            <field name="MapOfInteger_String92" column="MAP_OF_INTEGER92_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String93" column="MAP_OF_INTEGER93_STRING">
+            <field name="MapOfInteger_String93" column="MAP_OF_INTEGEshSetOfShort40" column="HASHSET_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="HashSetOfShort41" table="HASHSET_OF_SHORT41">
                 <join column="IDENTIFIER"/>



t 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"/>
@@ -67,7 +68,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>
             <field name="ListOfDate14" table="LIST_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -79,7 +81,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLocale16" column="LIST_OF_LOCALE16">
+    ld name="MapOfDouble_String73" column="MAP_OF_DOUBLE73_STRING">
+            <field name="MapOfDouble_String73" column="MAP_OF_DOUBLE73_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String74" column="MAP_OF_DOUBLE74_STRING">
+            <field name="MapOfDouble_String74" column="MAP_OF_DOUBLE74_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String75" column="MAP_OF_DOUBLE75_STRING">
+            <field name="MapOfDouble_String75" column="MAP_OF_DOUBLE75_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String76" column="MAP_OF_DOUBLE76_STRING">
+            <field name="MapOfDouble_String76" column="MAP_OF_DOUBLE76_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfDouble_String78" column="MAP_OF_DOUBLE78_STRING">
+            <field name="MapOfDouble_String78" column="MAP_OF_DOUBLE78_R93_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String94" column="MAP_OF_INTEGER94_STRING">
+            <field name="MapOfInteger_String94" column="MAP_OF_INTEGER94_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String96" column="MAP_OF_INTEGER96_STRING">
+            <field name="MapOfInteger_String96" column="MAP_OF_INTEGER96_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfInteger_String98" table="MAP_OF_INTEGER98_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfLong_String99" column="MAP_OF_LONG99_STRING">
+            <field name="MapOfLong_String99" column="MAP_OF_L        <field name="ListOfLocale16" column="LIST_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="ListOfLocale17" table="LIST_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -91,7 +94,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"/>
@@ -103,7 +107,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"
+                   serialSTRING"
+                   serialized="true">
             </field>
             <field name="MapOfDouble_String80" table="MAP_OF_DOUBLE80_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="DOUBLEVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING">
+            <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String82" column="MAP_OF_FLOAT82_STRING">
+            <field name="MapOfFloat_String82" column="MAP_OF_FLOAT82_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String83" column="MAP_OF_FLOAT83_STRING">
+            <field name="MapOfFloat_String83" column="MAP_OF_FLOAT83_STRING"
+    ONG99_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String100" column="MAP_OF_LONG100_STRING">
+            <field name="MapOfLong_String100" column="MAP_OF_LONG100_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String101" column="MAP_OF_LONG101_STRING">
+            <field name="MapOfLong_String101" column="MAP_OF_LONG101_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String102" column="MAP_OF_LONG102_STRING">
+            <field name="MapOfLong_String102" column="MAP_OF_LONG102_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String103" column="MAP_OF_LONG103_STRING">
+            <field name="MapOfLong_String103" column="MAP_OF_LONG103_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String105" column="MAP_OF_LONG105_STRING"ized="true">
             </field>
             <field name="ListOfBigInteger23" table="LIST_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -115,9 +120,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"/>
                 <order column="INDEX"/>
@@ -127,7 +133,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"/>
@@ -139,7 +146,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"/>
@@ -151,7 +159,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <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="IDEN>
+            <field name="MapOfLong_String105" column="MAP_OF_LONG105_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfLong_String107" table="MAP_OF_LONG107_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="LONGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING">
+            <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String109" column="MAP_OF_SHORT109_STRING">
+            <field name="MapOfShort_String109" column="MAP_OF_SHORT109_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String110" column="MAP_OF_SHORT110_STRING">
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String84" column="MAP_OF_FLOAT84_STRING">
+            <field name="MapOfFloat_String84" column="MAP_OF_FLOAT84_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String85" column="MAP_OF_FLOAT85_STRING">
+            <field name="MapOfFloat_String85" column="MAP_OF_FLOAT85_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfFloat_String87" column="MAP_OF_FLOAT87_STRING">
+            <field name="MapOfFloat_String87" column="MAP_OF_FLOAT87_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfFloat_String89" table="MAP_OF_FLOAT89_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="FLOATVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <orderTIFIER"/>
@@ -163,7 +172,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"/>
@@ -175,7 +185,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfShort40" column="LIST_OF_SHORT40">
+            <field name="ListOfShort40" column="LIST_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="ListOfShort41" table="LIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>



        <field name="MapOfShort_String110" column="MAP_OF_SHORT110_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String111" column="MAP_OF_SHORT111_STRING">
+            <field name="MapOfShort_String111" column="MAP_OF_SHORT111_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String112" column="MAP_OF_SHORT112_STRING">
+            <field name="MapOfShort_String112" column="MAP_OF_SHORT112_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String114" column="MAP_OF_SHORT114_STRING">
+            <field name="MapOfShort_String114" column="MAP_OF_SHORT114_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfShort_String116" table="MAP_OF_SHORT116_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SHORTVAL"/>
-                <value column="STRING"/>
+             column="INDEX"/>
             </field>
-            <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING">
+            <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String91" column="MAP_OF_INTEGER91_STRING">
+            <field name="MapOfInteger_String91" column="MAP_OF_INTEGER91_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String92" column="MAP_OF_INTEGER92_STRING">
+            <field name="MapOfInteger_String92" column="MAP_OF_INTEGER92_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String93" column="MAP_OF_INTEGER93_STRING">
+            <field name="MapOfInteger_String93" column="MAP_OF_INTEGER93_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String94" column="MAP_OF_INTEGER94_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/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -54,7 +54,8 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfString10" column="SET_OF_STRING10">
+            <field name="SetOfString10" column="SET_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="SetOfString11" table="SET_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -66,7 +67,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDate13" column="SET_OF_DATE13">
+            <field name="SetOfDate13" column="SET_OF_DATE13"
+                   serialized="true">
             </field>
             <field name="SetOfDate14" table="SET_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -78,7 +80,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLocale16" column="SET_OF_LOCALE16">
+            <field name="SetOfLocale16" column="SET_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="SetOfLocale17" table="SET_OF_LOCAL">
+            <field name="MapOfInteger_String94" column="MAP_OF_INTEGER94_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfInteger_String96" column="MAP_OF_INTEGER96_STRING">
+            <field name="MapOfInteger_String96" column="MAP_OF_INTEGER96_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfInteger_String98" table="MAP_OF_INTEGER98_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="INTEGERVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfLong_String99" column="MAP_OF_LONG99_STRING">
+            <field name="MapOfLong_String99" column="MAP_OF_LONG99_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String100" column="MAP_OF_LONG100_STRING">E17">
                 <join column="IDENTIFIER"/>
@@ -90,7 +93,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL18">
+            <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
             <field name="SetOfBigDecimal20" table="SET_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -102,7 +106,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22">
+            <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="SetOfBigInteger23" table="SET_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -114,9 +119,10 @@
                 <el
+            <field name="MapOfLong_String100" column="MAP_OF_LONG100_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String101" column="MAP_OF_LONG101_STRING">
+            <field name="MapOfLong_String101" column="MAP_OF_LONG101_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String102" column="MAP_OF_LONG102_STRING">
+            <field name="MapOfLong_String102" column="MAP_OF_LONG102_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String103" column="MAP_OF_LONG103_STRING">
+            <field name="MapOfLong_String103" column="MAP_OF_LONG103_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfLong_String105" column="MAP_OF_LONG105_STRING">
+            <field name="MapOfLong_String105" column="MAP_OF_LONG105_STRING"
+                   serialized="true">
             </field>
            ement column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfByte25" column="SET_OF_BYTE25">
+            <field name="SetOfByte25" column="SET_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="SetOfByte26" table="SET_OF_BYTE27">
+            <field name="SetOfByte26" table="SET_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
@@ -126,7 +132,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDouble28" column="SET_OF_DOUBLE28">
+            <field name="SetOfDouble28" column="SET_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="SetOfDouble29" table="SET_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -138,7 +145,8 @@
                 <element column="FLOATV <field name="MapOfLong_String107" table="MAP_OF_LONG107_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="LONGVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING">
+            <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String109" column="MAP_OF_SHORT109_STRING">
+            <field name="MapOfShort_String109" column="MAP_OF_SHORT109_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String110" column="MAP_OF_SHORT110_STRING">
+            <field name="MapOfShort_String110" column="MAP_OF_SHORT110_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String111" column="MAP_OF_SHORT111_STRING">
+            <field name="MapOfShort_String111" column="MAP_OF_SHORT111_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String112" column="MAP_OF_SHORT112_STRING">
+            <field name="MapOfShort_String112" column="MAP_OF_SHORT112_STRING"
+                   serialized="true">
             </field>
-            <field name="MapOfShort_String114" column="MAP_OF_SHORT114_STRING">
+            <field name="MapOfShort_String114" column="MAP_OF_SHORT114_STRING"
+                   serialized="true">
             </field>
             <field name="MapOfShort_String116" table="MAP_OF_SHORT116_STRING">
                 <join column="IDENTIFIER"/>
-                <key column="SHORTVAL"/>
-                <value column="STRING"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
         </class>

AL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfFloat31" column="SET_OF_FLOAT31">
+            <field name="SetOfFloat31" column="SET_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="SetOfFloat32" table="SET_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -150,7 +158,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfInteger34" column="SET_OF_INTEGER34">
+            <field name="SetOfInteger34" column="SET_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="SetOfInteger35" table="SET_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -162,7 +171,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLong37" column="SET_OF_LONG37">
+            <field namModified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -55,7 +55,8 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfString10" column="SET_OF_STRING10">
+            <field name="SetOfString10" column="SET_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="SetOfString11" table="Se="SetOfLong37" column="SET_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="SetOfLong38" table="SET_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -174,7 +184,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfShort40" column="SET_OF_SHORT40">
+            <field name="SetOfShort40" column="SET_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="SetOfShort41" table="SET_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==================================================ET_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -67,7 +68,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDate13" column="SET_OF_DATE13">
+            <field name="SetOfDate13" column="SET_OF_DATE13"
+                   serialized="true">
             </field>
             <field name="SetOfDate14" table="SET_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -79,7 +81,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLocale16" column="SET_OF_LOCALE16">
+            <field name="SetOfLocale16" column="SET_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="SetOfLocale17" table="SET_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -91,7 +94,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>============================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -84,7 +84,7 @@
             </field>
             <field name="TreeMapOfString_Byte25" column="TREEMAP_STR_BYTE25">
             </field>
-            <field name="TreeMapOfString_Byte26" column="TREEMAP_STR_BYTE27">
+            <field name="TreeMapOfString_Byte26" column="TREEMAP_STR_BYTE26">
             </field>
             <field name="TreeMapOfString_Double27" column="TREEMAP_STR_DOUBLE27">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby
             </field>
-            <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL18">
+            <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
             <field name="SetOfBigDecimal20" table="SET_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -103,7 +107,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22">
+            <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="SetOfBigInteger23" table="SET_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -115,9 +120,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfByte25" column="SET_OF_BYTE25">
+         .orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -54,7 +54,8 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfString10" column="VECTOR_OF_STRING10">
+            <field name="VectorOfString10" column="VECTOR_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="VectorOfString11" table="VECTOR_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -66,7 +67,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfDate13" colu   <field name="SetOfByte25" column="SET_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="SetOfByte26" table="SET_OF_BYTE27">
+            <field name="SetOfByte26" table="SET_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
@@ -127,7 +133,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDouble28" column="SET_OF_DOUBLE28">
+            <field name="SetOfDouble28" column="SET_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="SetOfDouble29" table="SET_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -139,7 +146,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfFloat31" column="SET_OF_FLOAT31">
+            <field name="Smn="VECTOR_OF_DATE13">
+            <field name="VectorOfDate13" column="VECTOR_OF_DATE13"
+                   serialized="true">
             </field>
             <field name="VectorOfDate14" table="VECTOR_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -78,7 +80,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfLocale16" column="VECTOR_OF_LOCALE16">
+            <field name="VectorOfLocale16" column="VECTOR_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="VectorOfLocale17" table="VECTOR_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -90,7 +93,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfBigDecimal19" column="VECTOR_OF_BIG_DECIMAL19">
+            <field name="VectorOfBigDecimal19" column="VECTOR_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
             <field name="VectorOfBigDecimal20" table="VECTOR_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -102,7 +106,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfBigInteger22" column="VECTOR_OF_BIG_INTEGER22">
+            <field name="VectorOfBigInteger22" column="VECTOR_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="VectorOfBigInteger23" table="VECTOR_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -114,9 +119,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfByte25" column="VECTOR_OF_BYTE25">
+            <field name="VectorOfByte25" column="VECTOR_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="VectorOfByte26" table="VECTOR_OF_BYTE27">
+            <field name="VectorOfByte26" table="VECTOR_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
@@ -126,7 +132,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfDouble28" column="VECTOR_OF_DOUBLE28">
+            <field name="VectorOfDouble28" column="VECTOR_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="VectorOfDouble29" table="VECTOR_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -138,7 +145,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfFloat31" column="VECTOR_OF_FLOAT31">
+            <field name="VectorOfFloat31" column="VECTOR_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="VectorOfFloat32" table="VECTOR_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -150,7 +158,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfInteger34" column="VECTOR_OF_INTEGER34">
+            <field name="VectorOfInteger34" column="VECTOR_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="VectorOfInteger35" table="VECTOR_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -162,7 +171,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfLong37" column="VECTOR_OF_LONG37">
+            <field name="VectorOfLong37" column="VECTOR_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="VectorOfLong38" table="VECTOR_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -174,7 +184,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfShort40" column="VECTOR_OF_SHORT40">
+            <field name="VectorOfShort40" column="VECTOR_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="VectorOfShort41" table="VECTOR_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -1,40 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <!--
-Metadata for application identity
+Metadata for datastore identity
 -->
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity strategy="identity"
+                                column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="ArrayOfObject0" column="ARRAY_OF_OBJECT0"/>
             <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1"/>
-            <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"/>
+            <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"
+                   serialized="true"/>
             <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3"/>
-            <field name="ArrayOfSimpleInterface4" column="ARRAY_OF_SIMPLE_INTERFACE4"/>
-            <field name="ArrayOfSimpleInterface5" table="ARRAY_OF_SIMPLE_INTERFACE5"/>
-            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
+            <field name="ArrayOfSimpleInterface4"
+                   column="ARRAY_OF_SIMPLE_INTERFACE4"
+                   serialized="true"/>
+            <field name="ArrayOfSimpleInterface5"
+                   table="ARRAY_OF_SIMPLE_INTERFACE5"/>
+            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"
+                   serialized="true"/>
             <field name="ArrayOfString7" table="ARRAY_OF_STRING7"/>
-            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
+            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"
+                   serialized="true"/>
             <field name="ArrayOfDate9" table="ARRAY_OF_DATE9"/>
-            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
+            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"
+                   serialized="true"/>
             <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11"/>
-            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
+            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"
+                   serialized="true"/>
             <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13"/>
-            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
+            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"
+                   serialized="true"/>
             <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15"/>
-            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
+            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"
+                   serialized="true"/>
             <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17"/>
-            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
+            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"
+                   serialized="true"/>
             <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19"/>
-            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
+            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"
+                   serialized="true"/>
             <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21"/>
-            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
+            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"
+                   serialized="true"/>
             <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23"/>
-            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
+            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"
+                   serialized="true"/>
             <field name="ArrayOfLong25" table="ARRAY_OF_LONG25"/>
-            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
+            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"
+                   serialized="true"/>
             <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27"/>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -55,7 +55,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -67,7 +68,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -79,7 +81,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -91,7 +94,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -103,7 +107,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -115,9 +120,10 @@
                 <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"/>
@@ -127,7 +133,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -139,7 +146,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -151,7 +159,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -163,7 +172,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -175,7 +185,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40">
+    etOfFloat31" column="SET_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="SetOfFloat32" table="SET_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -151,7 +159,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfInteger34" column="SET_OF_INTEGER34">
+            <field name="SetOfInteger34" column="SET_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="SetOfInteger35" table="SET_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -163,7 +172,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLong37" column="SET_OF_LONG37">
+            <field name="SetOfLong37" column="SET_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="SetOfLong38" table="SET_OF_LONG38">        <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="ArrayListOfShort41" table="ARRAYLIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -45,7 +45,8 @@
                 <join column="IDENTIFIER"/>
                 <element 
                 <join column="IDENTIFIER"/>
@@ -175,7 +185,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfShort40" column="SET_OF_SHORT40">
+            <field name="SetOfShort40" column="SET_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="SetOfShort41" table="SET_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm (originacolumn="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">
                 <join column="IDENTIFIER"/>
@@ -55,7 +56,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -65,7 +67,8 @@
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOl)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -85,7 +85,7 @@
             </field>
             <field name="TreeMapOfString_Byte25" column="TREEMAP_STR_BYTE25">
             </field>
-            <field name="TreeMapOfString_Byte26" column="TREEMAP_STR_BYTE27">
+            <field name="TreeMapOfString_Byte26" column="TREEMAP_STR_BYTE26">
             </field>
             <field name="TreeMapOfString_Double27" column="TREEMAP_STR_DOUBLE27">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastorefLocale16" column="COLLECTION_OF_LOCALE16">
+            <field name="CollectionOfLocale16" column="COLLECTION_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="CollectionOfLocale17" table="COLLECTION_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -75,7 +78,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -85,7 +89,8 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfBigInteger22" column="COLLECidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm Tue Jul 26 13:17:23 2005
@@ -55,7 +55,8 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfString10" column="VECTOR_OF_STRING10">
+            <field name="VectorOfString10" column="VECTOR_OF_STRING10"
+                   serialized="true">
             </field>
             <field name="VectorOfString11" table="VECTOR_OF_STRING11">
                 <join column="IDENTIFIER"/>
@@ -67,7 +68,8 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfDate13" column="VECTOR_OF_DATE13">
+            <field name="VectorOfDate13" column="VECTOR_OF_DATE13"
+                   serialized="true">
             </field>
             <field name="VectorOfDate14" table="VECTOR_OF_DATE14">
                 <join column="IDENTIFIER"/>
@@ -79,7 +81,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfLocale16" column="VECTOR_OF_LOCALE16">
+            <field name="VectorOfLocale16" column="VECTOR_OF_LOCALE16"
+                   serialized="true">
             </field>
             <field name="VectorOfLocale17" table="VECTOR_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
@@ -91,7 +94,8 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfBigDecimal19" column="VECTOR_OF_BIG_DECIMAL19">
+            <field name="VectorOfBigDecimal19" column="VECTOR_OF_BIG_DECIMAL19"
+                   serialized="true">
             </field>
             <field name="VectorOfBigDecimal20" table="VECTOR_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
@@ -103,7 +107,8 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfBigInteger22" column="VECTOR_OF_BIG_INTEGER22">
+            <field name="VectorOfBigInteger22" column="VECTOR_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="VectorOfBigInteger23" table="VECTOR_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -115,9 +120,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfByte25" column="VECTOR_OF_BYTE25">
+            <field name="VectorOfByte25" column="VECTOR_OF_BYTE25"
+                   serialized="true">
             </field>
-            <field name="VectorOfByte26" table="VECTOR_OF_BYTE27">
+            <field name="VectorOfByte26" table="VECTOR_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
@@ -127,7 +133,8 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfDouble28" column="VECTOR_OF_DOUBLE28">
+            <field name="VectorOfDouble28" column="VECTOR_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="VectorOfDouble29" table="VECTOR_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -139,7 +146,8 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfFloat31" column="VECTOR_OF_FLOAT31">
+            <field name="VectorOfFloat31" column="VECTOR_OF_FLOAT31"
+                   serialized="true">
             </field>
             <field name="VectorOfFloat32" table="VECTOR_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
@@ -151,7 +159,8 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfInteger34" column="VECTOR_OF_INTEGER34">
+            <field name="VectorOfInteger34" column="VECTOR_OF_INTEGER34"
+                   serialized="true">
             </field>
             <field name="VectorOfInteger35" table="VECTOR_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -163,7 +172,8 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfLong37" column="VECTOR_OF_LONG37">
+            <field name="VectorOfLong37" column="VECTOR_OF_LONG37"
+                   serialized="true">
             </field>
             <field name="VectorOfLong38" table="VECTOR_OF_LONG38">
                 <join column="IDENTIFIER"/>
@@ -175,7 +185,8 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfShort40" column="VECTOR_OF_SHORT40">
+            <field name="VectorOfShort40" column="VECTOR_OF_SHORT40"
+                   serialized="true">
             </field>
             <field name="VectorOfShort41" table="VECTOR_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Tue Jul 26 13:17:23 2005
@@ -202,8 +202,8 @@
 );
 
 CREATE TABLE project_reviewer (
-    PROJID INTEGER REFERENCES projects NOT NULL,
-    REVIEWER INTEGER REFERENCES persons NOT NULL
+    PROJID INTEGER NOT NULL,
+    REVIEWER INTEGER NOT NULL
 );
 
 CREATE TABLE project_member (
@@ -334,7 +334,7 @@
TION_OF_BIG_INTEGER22">
+            <field name="CollectionOfBigInteger22" column="COLLECTION_OF_BIG_INTEGER22"
+                   serialized="true">
             </field>
             <field name="CollectionOfBigInteger23" table="COLLECTION_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
@@ -95,7 +100,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -105,7 +111,8 @@
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfDouble28" column="COLLECTION_OF_DOUBLE28">
+            <field name="Collectio DROP TABLE LIST_OF_BIG_DECIMAL20;
 DROP TABLE LIST_OF_BIG_INTEGER21;
 DROP TABLE LIST_OF_BIG_INTEGER23;
-DROP TABLE LIST_OF_BYTE25;
+DROP TABLE LIST_OF_BYTE24;
 DROP TABLE LIST_OF_BYTE26;
 DROP TABLE LIST_OF_DOUBLE27;
 DROP TABLE LIST_OF_DOUBLE29;
@@ -576,7 +576,6 @@
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS88;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS89;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE91;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHMAP_STR_STRING95;
 DROP TABLE HASHMAP_STR_DATE98;
@@ -3271,7 +3270,7 @@
     INDEX INTEGER NOT NULL
 );
 
-CREATE TABLE LIST_OF_BYTE25
+CREATE TABLE LIST_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
@@ -4823,7 +4822,7 @@
 	MAP_OF_STRING_INTEGER77 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_LONG78 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_LONG79 LONG VARCHAR FOR BIT DATA,
-	MAP_OF_STRING_LONG80 LONG VARCHAR FOR BIT DATA,
+    MAP_OF_STRING_LONG80 LONG VARCHAR FOR BIT DATnOfDouble28" column="COLLECTION_OF_DOUBLE28"
+                   serialized="true">
             </field>
             <field name="CollectionOfDouble29" table="COLLECTION_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
@@ -115,7 +122,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -125,7 +133,8 @@
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34">
+            <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34"
+                  A,
 	MAP_OF_STRING_SHORT81 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_SHORT82 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_SHORT83 LONG VARCHAR FOR BIT DATA,
@@ -4835,7 +4834,7 @@
 	MAP_OF_STRING_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	MAP_OF_STRING_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	MAP_OF_STRING_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BYTE108 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BYTE109 LONG VARCHAR FOR BIT DATA,
@@ -5236,7 +5235,7 @@
 	HASHMAP_STR_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	HASHMAP_STR_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	HASHMAP_STR_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BYTE108 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BYTE109 LONG VARCHAR FOR BIT DATA,
@@ -5454,14 +5453,6 @@
     INDEX INTEGER NOT NULL
 );
 
-CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE91
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
@@ -5637,7 +5628,7 @@
 	HASHTBL_STR_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	HASHTBL_STR_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	HASHTBL_STR_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BYTE108 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BYTE109 LONG VARCHAR FOR BIT DATA,
@@ -7422,7 +7413,7 @@
 	TREEMAP_STR_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BIG_DECIMAL serialized="true">
             </field>
             <field name="CollectionOfInteger35" table="COLLECTION_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
@@ -135,7 +144,8 @@
                 <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">
                 <join column="IDENTIFIER"/>
@@ -145,7 +155,8 @@
                 <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="CollectionO102 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	TREEMAP_STR_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	TREEMAP_STR_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BYTE108 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BYTE109 LONG VARCHAR FOR BIT DATA,

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=225384&r1=225383&r2=225384&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Tue Jul 26 13:17:23 2005
@@ -150,7 +150,7 @@
 );
 
 CREATE TABLE project_reviewer (
-    PROJID INTEGER REFERENCES projects NOT NULL,
+    PROJID INTEGER NOT NULL,
     REVIEWER INTEGER REFERENCES persons NfShort41" table="COLLECTION_OF_SHORT41">
                 <join column="IDENTIFIER"/>



OT NULL
 );
 
@@ -4820,7 +4820,7 @@
 	MAP_OF_STRING_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	MAP_OF_STRING_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	MAP_OF_STRING_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BYTE108 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_BYTE109 LONG VARCHAR FOR BIT DATA,
@@ -5222,7 +5222,7 @@
 	HASHMAP_STR_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	HASHMAP_STR_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	HASHMAP_STR_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BYTE108 LONG VARCHAR FOR BIT DATA,
 	HASHMAP_STR_BYTE109 LONG VARCHAR FOR BIT DATA,
@@ -5624,7 +5624,7 @@
 	HASHTBL_STR_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	HASHTBL_STR_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	HASHTBL_STR_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BYTE108 LONG VARCHAR FOR BIT DATA,
 	HASHTBL_STR_BYTE109 LONG VARCHAR FOR BIT DATA,
@@ -7414,7 +7414,7 @@
 	TREEMAP_STR_LOCALE100 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BIG_DECIMAL102 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BIG_DECIMAL103 LONG VARCHAR FOR BIT DATA,
-	TREEMAP_STR_BIG_INTEGER015 LONG VARCHAR FOR BIT DATA,
+	TREEMAP_STR_BIG_INTEGER105 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BIG_INTEGER106 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BYTE108 LONG VARCHAR FOR BIT DATA,
 	TREEMAP_STR_BYTE109 LONG VARCHAR FOR BIT DATA,



Mime
View raw message