From jdo-commits-return-1079-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Thu Nov 03 00:25:48 2005
Return-Path: <jdo-commits-return-1079-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 59932 invoked from network); 3 Nov 2005 00:25:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 3 Nov 2005 00:25:48 -0000
Received: (qmail 62715 invoked by uid 500); 3 Nov 2005 00:25:48 -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 62654 invoked by uid 99); 3 Nov 2005 00:25:45 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=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; Wed, 02 Nov 2005 16:25:42 -0800
Received: (qmail 59742 invoked by uid 65534); 3 Nov 2005 00:25:21 -0000
Message-ID: <20051103002521.59733.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r330395 [6/8] - in /incubator/jdo/trunk/tck20/test:
 jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
 jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
 orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreide...
Date: Thu, 03 Nov 2005 00:25:03 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.5
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/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=330395&r1=330394&r2=330395&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 Wed Nov  2 16:24:51 2005
@@ -2,345 +2,508 @@
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="MapStringValueCollections" table="MAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+        <class name="MapStringValueCollections"
+               table="MAPSTRINGVALUE_COLLECTIONS">
+            <datastore-identity strategy="identity"
+                                column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
-            <field name="MapOfObject_String0" table="MAP_OF_OBJECT0_STRING">
+            <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String1" table="MAP_OF_OBJECT1_STRING">
+            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String2" table="MAP_OF_OBJECT2_STRING">
+            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String3" table="MAP_OF_OBJECT3_STRING">
+            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String4" table="MAP_OF_OBJECT4_STRING">
+            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String6" table="MAP_OF_OBJECT6_STRING">
+            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String8" table="MAP_OF_OBJECT8_STRING">
+            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
+            </field>
+            <field name="MapOfSimpleClass_String9"
+                   table="MAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String9" table="MAP_OF_SIMPLE_CLASS9_STRING">
+            <field name="MapOfSimpleClass_String10"
+                   table="MAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String10" table="MAP_OF_SIMPLE_CLASS10_STRING">
+            <field name="MapOfSimpleClass_String11"
+                   table="MAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String11" table="MAP_OF_SIMPLE_CLASS11_STRING">
+            <field name="MapOfSimpleClass_String12"
+                   table="MAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String12" table="MAP_OF_SIMPLE_CLASS12_STRING">
+            <field name="MapOfSimpleClass_String13"
+                   table="MAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String13" table="MAP_OF_SIMPLE_CLASS13_STRING">
+            <field name="MapOfSimpleClass_String15"
+                   table="MAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String15" table="MAP_OF_SIMPLE_CLASS15_STRING">
+            <field name="MapOfSimpleClass_String17"
+                   column="MAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="MapOfSimpleInterface_String18"
+                   table="MAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String17" table="MAP_OF_SIMPLE_CLASS17_STRING">
+            <field name="MapOfSimpleInterface_String19"
+                   table="MAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String18" table="MAP_OF_SIMPLE_INTERFACE18_STRING">
+            <field name="MapOfSimpleInterface_String20"
+                   table="MAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String19" table="MAP_OF_SIMPLE_INTERFACE19_STRING">
+            <field name="MapOfSimpleInterface_String21"
+                   table="MAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String20" table="MAP_OF_SIMPLE_INTERFACE20_STRING">
+            <field name="MapOfSimpleInterface_String22"
+                   table="MAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String21" table="MAP_OF_SIMPLE_INTERFACE21_STRING">
+            <field name="MapOfSimpleInterface_String24"
+                   table="MAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String22" table="MAP_OF_SIMPLE_INTERFACE22_STRING">
+            <field name="MapOfSimpleInterface_String26"
+                   column="MAP_SIMPLE_INTERFACE26_STR">
+            </field>
+            <field name="MapOfString_String27" table="MAP_STRING27_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String24" table="MAP_OF_SIMPLE_INTERFACE24_STRING">
+            <field name="MapOfString_String28" table="MAP_STRING28_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String26" table="MAP_OF_SIMPLE_INTERFACE26_STRING">
+            <field name="MapOfString_String29" table="MAP_STRING29_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING"
-                   >
-            </field>
-            <field name="MapOfString_String28" column="MAP_OF_STRING28_STRING"
-                   >
-            </field>
-            <field name="MapOfString_String29" column="MAP_OF_STRING29_STRING"
-                   >
-            </field>
-            <field name="MapOfString_String30" column="MAP_OF_STRING30_STRING"
-                   >
-            </field>
-            <field name="MapOfString_String31" column="MAP_OF_STRING31_STRING"
-                   >
+            <field name="MapOfString_String30" table="MAP_STRING30_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfString_String33" column="MAP_OF_STRING33_STRING"
-                   >
+            <field name="MapOfString_String31" table="MAP_STRING31_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfString_String35" table="MAP_OF_STRING35_STRING">
+            <field name="MapOfString_String33" table="MAP_STRING33_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDate_String36" column="MAP_OF_DATE36_STRING"
-                   >
+            <field name="MapOfString_String35" column="MAP_STRING35_STR">
             </field>
-            <field name="MapOfDate_String37" column="MAP_OF_DATE37_STRING"
-                   >
+            <field name="MapOfDate_String36" table="MAP_DATE36_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDate_String38" column="MAP_OF_DATE38_STRING"
-                   >
+            <field name="MapOfDate_String37" table="MAP_DATE37_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDate_String39" column="MAP_OF_DATE39_STRING"
-                   >
+            <field name="MapOfDate_String38" table="MAP_DATE38_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDate_String40" column="MAP_OF_DATE40_STRING"
-                   >
+            <field name="MapOfDate_String39" table="MAP_DATE39_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDate_String42" column="MAP_OF_DATE42_STRING"
-                   >
+            <field name="MapOfDate_String40" table="MAP_DATE40_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDate_String44" table="MAP_OF_DATE44_STRING">
+            <field name="MapOfDate_String42" table="MAP_DATE42_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING"
-                   >
+            <field name="MapOfDate_String44" column="MAP_DATE44_STR">
             </field>
-            <field name="MapOfBigDecimal_String46" column="MAP_OF_BIG_DECIMAL46_STRING"
-                   >
+            <field name="MapOfBigDecimal_String45"
+                   table="MAP_BIG_DECIMAL45_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigDecimal_String47" column="MAP_OF_BIG_DECIMAL47_STRING"
-                   >
+            <field name="MapOfBigDecimal_String46"
+                   table="MAP_BIG_DECIMAL46_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigDecimal_String48" column="MAP_OF_BIG_DECIMAL48_STRING"
-                   >
+            <field name="MapOfBigDecimal_String47"
+                   table="MAP_BIG_DECIMAL47_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigDecimal_String49" column="MAP_OF_BIG_DECIMAL49_STRING"
-                   >
+            <field name="MapOfBigDecimal_String48"
+                   table="MAP_BIG_DECIMAL48_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigDecimal_String51" column="MAP_OF_BIG_DECIMAL51_STRING"
-                   >
+            <field name="MapOfBigDecimal_String49"
+                   table="MAP_BIG_DECIMAL49_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
+            <field name="MapOfBigDecimal_String51"
+                   table="MAP_BIG_DECIMAL51_STR">
                 <join column="IDENTIFIER"/>
-                <key>
-                    <column name="KEYVAL" jdbc-type="DECIMAL" length="17" scale="6"/>
-                </key>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING"
-                   >
+            <field name="MapOfBigDecimal_String53"
+                   column="MAP_BIG_DECIMAL53_STR">
             </field>
-            <field name="MapOfBigInteger_String55" column="MAP_OF_BIG_INTEGER55_STRING"
-                   >
+            <field name="MapOfBigInteger_String54"
+                   table="MAP_BIG_INTEGER54_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigInteger_String56" column="MAP_OF_BIG_INTEGER56_STRING"
-                   >
+            <field name="MapOfBigInteger_String55"
+                   table="MAP_BIG_INTEGER55_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigInteger_String57" column="MAP_OF_BIG_INTEGER57_STRING"
-                   >
+            <field name="MapOfBigInteger_String56"
+                   table="MAP_BIG_INTEGER56_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigInteger_String58" column="MAP_OF_BIG_INTEGER58_STRING"
-                   >
+            <field name="MapOfBigInteger_String57"
+                   table="MAP_BIG_INTEGER57_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigInteger_String60" column="MAP_OF_BIG_INTEGER60_STRING"
-                   >
+            <field name="MapOfBigInteger_String58"
+                   table="MAP_BIG_INTEGER58_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfBigInteger_String62" table="MAP_OF_BIG_INTEGER62_STRING">
+            <field name="MapOfBigInteger_String60"
+                   table="MAP_BIG_INTEGER60_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING"
-                   >
+            <field name="MapOfBigInteger_String62"
+                   column="MAP_BIG_INTEGER62_STR">
             </field>
-            <field name="MapOfByte_String64" column="MAP_OF_BYTE64_STRING"
-                   >
+            <field name="MapOfByte_String63" table="MAP_BYTE63_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfByte_String65" column="MAP_OF_BYTE65_STRING"
-                   >
+            <field name="MapOfByte_String64" table="MAP_BYTE64_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfByte_String66" column="MAP_OF_BYTE66_STRING"
-                   >
+            <field name="MapOfByte_String65" table="MAP_BYTE65_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfByte_String67" column="MAP_OF_BYTE67_STRING"
-                   >
+            <field name="MapOfByte_String66" table="MAP_BYTE66_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfByte_String69" column="MAP_OF_BYTE69_STRING"
-                   >
+            <field name="MapOfByte_String67" table="MAP_BYTE67_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfByte_String71" table="MAP_OF_BYTE71_STRING">
+            <field name="MapOfByte_String69" table="MAP_BYTE69_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING"
-                   >
+            <field name="MapOfByte_String71" column="MAP_BYTE71_STR">
             </field>
-            <field name="MapOfDouble_String73" column="MAP_OF_DOUBLE73_STRING"
-                   >
+            <field name="MapOfDouble_String72" table="MAP_DOUBLE72_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDouble_String74" column="MAP_OF_DOUBLE74_STRING"
-                   >
+            <field name="MapOfDouble_String73" table="MAP_DOUBLE73_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDouble_String75" column="MAP_OF_DOUBLE75_STRING"
-                   >
+            <field name="MapOfDouble_String74" table="MAP_DOUBLE74_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDouble_String76" column="MAP_OF_DOUBLE76_STRING"
-                   >
+            <field name="MapOfDouble_String75" table="MAP_DOUBLE75_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDouble_String78" column="MAP_OF_DOUBLE78_STRING"
-                   >
+            <field name="MapOfDouble_String76" table="MAP_DOUBLE76_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfDouble_String80" table="MAP_OF_DOUBLE80_STRING">
+            <field name="MapOfDouble_String78" table="MAP_DOUBLE78_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING"
-                   >
+            <field name="MapOfDouble_String80" column="MAP_DOUBLE80_STR">
             </field>
-            <field name="MapOfFloat_String82" column="MAP_OF_FLOAT82_STRING"
-                   >
+            <field name="MapOfFloat_String81" table="MAP_FLOAT81_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfFloat_String83" column="MAP_OF_FLOAT83_STRING"
-                   >
+            <field name="MapOfFloat_String82" table="MAP_FLOAT82_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfFloat_String84" column="MAP_OF_FLOAT84_STRING"
-                   >
+            <field name="MapOfFloat_String83" table="MAP_FLOAT83_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfFloat_String85" column="MAP_OF_FLOAT85_STRING"
-                   >
+            <field name="MapOfFloat_String84" table="MAP_FLOAT84_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfFloat_String87" column="MAP_OF_FLOAT87_STRING"
-                   >
+            <field name="MapOfFloat_String85" table="MAP_FLOAT85_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfFloat_String89" table="MAP_OF_FLOAT89_STRING">
+            <field name="MapOfFloat_String87" table="MAP_FLOAT87_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING"
-                   >
+            <field name="MapOfFloat_String89" column="MAP_FLOAT89_STR">
             </field>
-            <field name="MapOfInteger_String91" column="MAP_OF_INTEGER91_STRING"
-                   >
+            <field name="MapOfInteger_String90" table="MAP_INTEGER90_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfInteger_String92" column="MAP_OF_INTEGER92_STRING"
-                   >
+            <field name="MapOfInteger_String91" table="MAP_INTEGER91_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfInteger_String93" column="MAP_OF_INTEGER93_STRING"
-                   >
+            <field name="MapOfInteger_String92" table="MAP_INTEGER92_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfInteger_String94" column="MAP_OF_INTEGER94_STRING"
-                   >
+            <field name="MapOfInteger_String93" table="MAP_INTEGER93_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfInteger_String96" column="MAP_OF_INTEGER96_STRING"
-                   >
+            <field name="MapOfInteger_String94" table="MAP_INTEGER94_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfInteger_String98" table="MAP_OF_INTEGER98_STRING">
+            <field name="MapOfInteger_String96" table="MAP_INTEGER96_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfLong_String99" column="MAP_OF_LONG99_STRING"
-                   >
+            <field name="MapOfInteger_String98" column="MAP_INTEGER98_STR">
             </field>
-            <field name="MapOfLong_String100" column="MAP_OF_LONG100_STRING"
-                   >
+            <field name="MapOfLong_String99" table="MAP_LONG99_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfLong_String101" column="MAP_OF_LONG101_STRING"
-                   >
+            <field name="MapOfLong_String100" table="MAP_LONG100_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfLong_String102" column="MAP_OF_LONG102_STRING"
-                   >
+            <field name="MapOfLong_String101" table="MAP_LONG101_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfLong_String103" column="MAP_OF_LONG103_STRING"
-                   >
+            <field name="MapOfLong_String102" table="MAP_LONG102_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfLong_String105" column="MAP_OF_LONG105_STRING"
-                   >
+            <field name="MapOfLong_String103" table="MAP_LONG103_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfLong_String107" table="MAP_OF_LONG107_STRING">
+            <field name="MapOfLong_String105" table="MAP_LONG105_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING"
-                   >
+            <field name="MapOfLong_String107" column="MAP_LONG107_STR">
             </field>
-            <field name="MapOfShort_String109" column="MAP_OF_SHORT109_STRING"
-                   >
+            <field name="MapOfShort_String108" table="MAP_SHORT108_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfShort_String110" column="MAP_OF_SHORT110_STRING"
-                   >
+            <field name="MapOfShort_String109" table="MAP_SHORT109_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfShort_String111" column="MAP_OF_SHORT111_STRING"
-                   >
+            <field name="MapOfShort_String110" table="MAP_SHORT110_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfShort_String112" column="MAP_OF_SHORT112_STRING"
-                   >
+            <field name="MapOfShort_String111" table="MAP_SHORT111_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfShort_String114" column="MAP_OF_SHORT114_STRING"
-                   >
+            <field name="MapOfShort_String112" table="MAP_SHORT112_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfShort_String116" table="MAP_OF_SHORT116_STRING">
+            <field name="MapOfShort_String114" table="MAP_SHORT114_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfShort_String116" column="MAP_SHORT116_STR">
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=330395&r1=330394&r2=330395&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Wed Nov  2 16:24:51 2005
@@ -2,316 +2,568 @@
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeMapStringValueCollections" table="TREEMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+        <class name="TreeMapStringValueCollections"
+               table="TREEMAPSTRINGVALUE_COLLECTIONS">
+            <datastore-identity strategy="identity"
+                                column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfObject_String3" table="TREEMAP_OBJECT3_STR">
+            <field name="TreeMapOfObject_String3"
+                   table="TREEMAP_OBJECT3_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfObject_String4" table="TREEMAP_OBJECT4_STR">
+            <field name="TreeMapOfObject_String4"
+                   table="TREEMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfObject_String6" table="TREEMAP_OBJECT6_STR">
+            <field name="TreeMapOfObject_String6"
+                   table="TREEMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfObject_String8" table="TREEMAP_OBJECT8_STR">
+            <field name="TreeMapOfObject_String8"
+                   column="TREEMAP_OBJECT8_STR">
+            </field>
+            <field name="TreeMapOfSimpleClass_String9"
+                   table="TREEMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String9" table="TREEMAP_SIMPLE_CLASS9_STR">
+            <field name="TreeMapOfSimpleClass_String10"
+                   table="TREEMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String10" table="TREEMAP_SIMPLE_CLASS10_STR">
+            <field name="TreeMapOfSimpleClass_String11"
+                   table="TREEMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String11" table="TREEMAP_SIMPLE_CLASS11_STR">
+            <field name="TreeMapOfSimpleClass_String12"
+                   table="TREEMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String12" table="TREEMAP_SIMPLE_CLASS12_STR">
+            <field name="TreeMapOfSimpleClass_String13"
+                   table="TREEMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String13" table="TREEMAP_SIMPLE_CLASS13_STR">
+            <field name="TreeMapOfSimpleClass_String15"
+                   table="TREEMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String15" table="TREEMAP_SIMPLE_CLASS15_STR">
+            <field name="TreeMapOfSimpleClass_String17"
+                   column="TREEMAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="TreeMapOfSimpleInterface_String18"
+                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String17" table="TREEMAP_SIMPLE_CLASS17_STR">
+            <field name="TreeMapOfSimpleInterface_String19"
+                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String18" table="TREEMAP_SIMPLE_INTERFACE18_STR">
+            <field name="TreeMapOfSimpleInterface_String20"
+                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String19" table="TREEMAP_SIMPLE_INTERFACE19_STR">
+            <field name="TreeMapOfSimpleInterface_String21"
+                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String20" table="TREEMAP_SIMPLE_INTERFACE20_STR">
+            <field name="TreeMapOfSimpleInterface_String22"
+                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String21" table="TREEMAP_SIMPLE_INTERFACE21_STR">
+            <field name="TreeMapOfSimpleInterface_String24"
+                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String22" table="TREEMAP_SIMPLE_INTERFACE22_STR">
+            <field name="TreeMapOfSimpleInterface_String26"
+                   column="TREEMAP_SIMPLE_INTERFACE26_STR">
+            </field>
+            <field name="TreeMapOfString_String27"
+                   table="TREEMAP_STRING27_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String24" table="TREEMAP_SIMPLE_INTERFACE24_STR">
+            <field name="TreeMapOfString_String28"
+                   table="TREEMAP_STRING28_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String26" table="TREEMAP_SIMPLE_INTERFACE26_STR">
+            <field name="TreeMapOfString_String29"
+                   table="TREEMAP_STRING29_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeMapOfString_String27" column="TREEMAP_STRING27_STR">
-            </field>
-            <field name="TreeMapOfString_String28" column="TREEMAP_STRING28_STR">
             </field>
-            <field name="TreeMapOfString_String29" column="TREEMAP_STRING29_STR">
-            </field>
-            <field name="TreeMapOfString_String30" column="TREEMAP_STRING30_STR">
-            </field>
-            <field name="TreeMapOfString_String31" column="TREEMAP_STRING31_STR">
+            <field name="TreeMapOfString_String30"
+                   table="TREEMAP_STRING30_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfString_String33" column="TREEMAP_STRING33_STR">
+            <field name="TreeMapOfString_String31"
+                   table="TREEMAP_STRING31_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfString_String35" table="TREEMAP_STRING35_STR">
+            <field name="TreeMapOfString_String33"
+                   table="TREEMAP_STRING33_STR">
                 <join column="IDENTIFIER"/>
-                <key column="STRINGVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfDate_String36" column="TREEMAP_DATE36_STR">
+            <field name="TreeMapOfString_String35"
+                   column="TREEMAP_STRING35_STR">
             </field>
-            <field name="TreeMapOfDate_String37" column="TREEMAP_DATE37_STR">
+            <field name="TreeMapOfDate_String36"
+                   table="TREEMAP_DATE36_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDate_String38" column="TREEMAP_DATE38_STR">
+            <field name="TreeMapOfDate_String37"
+                   table="TREEMAP_DATE37_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDate_String39" column="TREEMAP_DATE39_STR">
+            <field name="TreeMapOfDate_String38"
+                   table="TREEMAP_DATE38_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDate_String40" column="TREEMAP_DATE40_STR">
+            <field name="TreeMapOfDate_String39"
+                   table="TREEMAP_DATE39_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDate_String42" column="TREEMAP_DATE42_STR">
+            <field name="TreeMapOfDate_String40"
+                   table="TREEMAP_DATE40_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDate_String44" table="TREEMAP_DATE44_STR">
+            <field name="TreeMapOfDate_String42"
+                   table="TREEMAP_DATE42_STR">
                 <join column="IDENTIFIER"/>
-                <key column="DATEVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfBigDecimal_String45" column="TREEMAP_BIG_DECIMAL45_STR">
+            <field name="TreeMapOfDate_String44"
+                   column="TREEMAP_DATE44_STR">
             </field>
-            <field name="TreeMapOfBigDecimal_String46" column="TREEMAP_BIG_DECIMAL46_STR">
+            <field name="TreeMapOfBigDecimal_String45"
+                   table="TREEMAP_BIG_DECIMAL45_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigDecimal_String47" column="TREEMAP_BIG_DECIMAL47_STR">
+            <field name="TreeMapOfBigDecimal_String46"
+                   table="TREEMAP_BIG_DECIMAL46_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigDecimal_String48" column="TREEMAP_BIG_DECIMAL48_STR">
+            <field name="TreeMapOfBigDecimal_String47"
+                   table="TREEMAP_BIG_DECIMAL47_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigDecimal_String49" column="TREEMAP_BIG_DECIMAL49_STR">
+            <field name="TreeMapOfBigDecimal_String48"
+                   table="TREEMAP_BIG_DECIMAL48_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigDecimal_String51" column="TREEMAP_BIG_DECIMAL51_STR">
+            <field name="TreeMapOfBigDecimal_String49"
+                   table="TREEMAP_BIG_DECIMAL49_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigDecimal_String53" table="TREEMAP_BIG_DECIMAL53_STR">
+            <field name="TreeMapOfBigDecimal_String51"
+                   table="TREEMAP_BIG_DECIMAL51_STR">
                 <join column="IDENTIFIER"/>
-                <key>
-                    <column name="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="17" scale="6"/>
-                </key>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfBigInteger_String54" column="TREEMAP_BIG_INTEGER54_STR">
+            <field name="TreeMapOfBigDecimal_String53"
+                   column="TREEMAP_BIG_DECIMAL53_STR">
             </field>
-            <field name="TreeMapOfBigInteger_String55" column="TREEMAP_BIG_INTEGER55_STR">
+            <field name="TreeMapOfBigInteger_String54"
+                   table="TREEMAP_BIG_INTEGER54_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigInteger_String56" column="TREEMAP_BIG_INTEGER56_STR">
+            <field name="TreeMapOfBigInteger_String55"
+                   table="TREEMAP_BIG_INTEGER55_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigInteger_String57" column="TREEMAP_BIG_INTEGER57_STR">
+            <field name="TreeMapOfBigInteger_String56"
+                   table="TREEMAP_BIG_INTEGER56_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigInteger_String58" column="TREEMAP_BIG_INTEGER58_STR">
+            <field name="TreeMapOfBigInteger_String57"
+                   table="TREEMAP_BIG_INTEGER57_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigInteger_String60" column="TREEMAP_BIG_INTEGER60_STR">
+            <field name="TreeMapOfBigInteger_String58"
+                   table="TREEMAP_BIG_INTEGER58_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfBigInteger_String62" table="TREEMAP_BIG_INTEGER62_STR">
+            <field name="TreeMapOfBigInteger_String60"
+                   table="TREEMAP_BIG_INTEGER60_STR">
                 <join column="IDENTIFIER"/>
-                <key column="BIG_INTEGERVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfByte_String63" column="TREEMAP_BYTE63_STR">
+            <field name="TreeMapOfBigInteger_String62"
+                   column="TREEMAP_BIG_INTEGER62_STR">
             </field>
-            <field name="TreeMapOfByte_String64" column="TREEMAP_BYTE64_STR">
+            <field name="TreeMapOfByte_String63"
+                   table="TREEMAP_BYTE63_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfByte_String65" column="TREEMAP_BYTE65_STR">
+            <field name="TreeMapOfByte_String64"
+                   table="TREEMAP_BYTE64_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfByte_String66" column="TREEMAP_BYTE66_STR">
+            <field name="TreeMapOfByte_String65"
+                   table="TREEMAP_BYTE65_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfByte_String67" column="TREEMAP_BYTE67_STR">
+            <field name="TreeMapOfByte_String66"
+                   table="TREEMAP_BYTE66_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfByte_String69" column="TREEMAP_BYTE69_STR">
+            <field name="TreeMapOfByte_String67"
+                   table="TREEMAP_BYTE67_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfByte_String71" table="TREEMAP_BYTE71_STR">
+            <field name="TreeMapOfByte_String69"
+                   table="TREEMAP_BYTE69_STR">
                 <join column="IDENTIFIER"/>
-                <key column="BYTEVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfDouble_String72" column="TREEMAP_DOUBLE72_STR">
+            <field name="TreeMapOfByte_String71"
+                   column="TREEMAP_BYTE71_STR">
             </field>
-            <field name="TreeMapOfDouble_String73" column="TREEMAP_DOUBLE73_STR">
+            <field name="TreeMapOfDouble_String72"
+                   table="TREEMAP_DOUBLE72_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDouble_String74" column="TREEMAP_DOUBLE74_STR">
+            <field name="TreeMapOfDouble_String73"
+                   table="TREEMAP_DOUBLE73_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDouble_String75" column="TREEMAP_DOUBLE75_STR">
+            <field name="TreeMapOfDouble_String74"
+                   table="TREEMAP_DOUBLE74_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDouble_String76" column="TREEMAP_DOUBLE76_STR">
+            <field name="TreeMapOfDouble_String75"
+                   table="TREEMAP_DOUBLE75_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDouble_String78" column="TREEMAP_DOUBLE78_STR">
+            <field name="TreeMapOfDouble_String76"
+                   table="TREEMAP_DOUBLE76_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfDouble_String80" table="TREEMAP_DOUBLE80_STR">
+            <field name="TreeMapOfDouble_String78"
+                   table="TREEMAP_DOUBLE78_STR">
                 <join column="IDENTIFIER"/>
-                <key column="DOUBLEVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfFloat_String81" column="TREEMAP_FLOAT81_STR">
+            <field name="TreeMapOfDouble_String80"
+                   column="TREEMAP_DOUBLE80_STR">
             </field>
-            <field name="TreeMapOfFloat_String82" column="TREEMAP_FLOAT82_STR">
+            <field name="TreeMapOfFloat_String81"
+                   table="TREEMAP_FLOAT81_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfFloat_String83" column="TREEMAP_FLOAT83_STR">
+            <field name="TreeMapOfFloat_String82"
+                   table="TREEMAP_FLOAT82_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfFloat_String84" column="TREEMAP_FLOAT84_STR">
+            <field name="TreeMapOfFloat_String83"
+                   table="TREEMAP_FLOAT83_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfFloat_String85" column="TREEMAP_FLOAT85_STR">
+            <field name="TreeMapOfFloat_String84"
+                   table="TREEMAP_FLOAT84_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfFloat_String87" column="TREEMAP_FLOAT87_STR">
+            <field name="TreeMapOfFloat_String85"
+                   table="TREEMAP_FLOAT85_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfFloat_String89" table="TREEMAP_FLOAT89_STR">
+            <field name="TreeMapOfFloat_String87"
+                   table="TREEMAP_FLOAT87_STR">
                 <join column="IDENTIFIER"/>
-                <key column="FLOATVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfInteger_String90" column="TREEMAP_INTEGER90_STR">
+            <field name="TreeMapOfFloat_String89"
+                   column="TREEMAP_FLOAT89_STR">
             </field>
-            <field name="TreeMapOfInteger_String91" column="TREEMAP_INTEGER91_STR">
+            <field name="TreeMapOfInteger_String90"
+                   table="TREEMAP_INTEGER90_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfInteger_String92" column="TREEMAP_INTEGER92_STR">
+            <field name="TreeMapOfInteger_String91"
+                   table="TREEMAP_INTEGER91_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfInteger_String93" column="TREEMAP_INTEGER93_STR">
+            <field name="TreeMapOfInteger_String92"
+                   table="TREEMAP_INTEGER92_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfInteger_String94" column="TREEMAP_INTEGER94_STR">
+            <field name="TreeMapOfInteger_String93"
+                   table="TREEMAP_INTEGER93_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfInteger_String96" column="TREEMAP_INTEGER96_STR">
+            <field name="TreeMapOfInteger_String94"
+                   table="TREEMAP_INTEGER94_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfInteger_String98" table="TREEMAP_INTEGER98_STR">
+            <field name="TreeMapOfInteger_String96"
+                   table="TREEMAP_INTEGER96_STR">
                 <join column="IDENTIFIER"/>
-                <key column="INTEGERVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfLong_String99" column="TREEMAP_LONG99_STR">
+            <field name="TreeMapOfInteger_String98"
+                   column="TREEMAP_INTEGER98_STR">
             </field>
-            <field name="TreeMapOfLong_String100" column="TREEMAP_LONG100_STR">
+            <field name="TreeMapOfLong_String99"
+                   table="TREEMAP_LONG99_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfLong_String101" column="TREEMAP_LONG101_STR">
+            <field name="TreeMapOfLong_String100"
+                   table="TREEMAP_LONG100_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfLong_String102" column="TREEMAP_LONG102_STR">
+            <field name="TreeMapOfLong_String101"
+                   table="TREEMAP_LONG101_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfLong_String103" column="TREEMAP_LONG103_STR">
+            <field name="TreeMapOfLong_String102"
+                   table="TREEMAP_LONG102_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfLong_String105" column="TREEMAP_LONG105_STR">
+            <field name="TreeMapOfLong_String103"
+                   table="TREEMAP_LONG103_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfLong_String107" table="TREEMAP_LONG107_STR">
+            <field name="TreeMapOfLong_String105"
+                   table="TREEMAP_LONG105_STR">
                 <join column="IDENTIFIER"/>
-                <key column="LONGVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfShort_String108" column="TREEMAP_SHORT108_STR">
+            <field name="TreeMapOfLong_String107"
+                   column="TREEMAP_LONG107_STR">
             </field>
-            <field name="TreeMapOfShort_String109" column="TREEMAP_SHORT109_STR">
+            <field name="TreeMapOfShort_String108"
+                   table="TREEMAP_SHORT108_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfShort_String110" column="TREEMAP_SHORT110_STR">
+            <field name="TreeMapOfShort_String109"
+                   table="TREEMAP_SHORT109_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfShort_String111" column="TREEMAP_SHORT111_STR">
+            <field name="TreeMapOfShort_String110"
+                   table="TREEMAP_SHORT110_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfShort_String112" column="TREEMAP_SHORT112_STR">
+            <field name="TreeMapOfShort_String111"
+                   table="TREEMAP_SHORT111_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfShort_String114" column="TREEMAP_SHORT114_STR">
+            <field name="TreeMapOfShort_String112"
+                   table="TREEMAP_SHORT112_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfShort_String116" table="TREEMAP_SHORT116_STR">
+            <field name="TreeMapOfShort_String114"
+                   table="TREEMAP_SHORT114_STR">
                 <join column="IDENTIFIER"/>
-                <key column="SHORTVAL"/>
+                <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
+            </field>
+            <field name="TreeMapOfShort_String116"
+                   column="TREEMAP_SHORT116_STR">
             </field>
         </class>
     </package>