Return-Path: 
 <jdo-commits-return-786-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 51720 invoked from network); 4 Aug 2005 15:40:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 Aug 2005 15:40:26 -0000
Received: (qmail 70395 invoked by uid 500); 4 Aug 2005 15:40:24 -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 70358 invoked by uid 99); 4 Aug 2005 15:40:24 -0000
X-ASF-Spam-Status: No, hits=-9.6 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; Thu, 04 Aug 2005 08:40:13 -0700
Received: (qmail 51526 invoked by uid 65534); 4 Aug 2005 15:40:10 -0000
Message-ID: <20050804154010.51525.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r227413 [1/3] - in /incubator/jdo/trunk/tck20/test:
 orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
 orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/
 sql/derby/applicationidentity/
Date: Thu, 04 Aug 2005 15:40:07 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.3
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mcaisse
Date: Thu Aug  4 08:39:53 2005
New Revision: 227413

URL: http://svn.apache.org/viewcvs?rev=227413&view=rev
Log:
JDO-112: Mismatch between ORM metadata and schema; JDO-113: Types of key/value columns and index columns in join tables; JDO-114: Change mapping of char fields; submitted by Michael Watzek

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm Thu Aug  4 08:39:53 2005
@@ -6,7 +6,9 @@
             <field name="id" column="ID" primary-key="true"/>
             <field name="fld_boolean" column="PRIMITIVEBOOLEAN"/>
             <field name="fld_byte" column="PRIMITIVEBYTE"/>
-            <field name="fld_char" column="PRIMITIVECHAR"/>
+            <field name="fld_char">
+                <column name="PRIMITIVECHAR" jdbc-type="INTEGER"/>
+            </field>
             <field name="fld_double" column="PRIMITIVEDOUBLE"/>
             <field name="fld_float" column="PRIMITIVEFLOAT"/>
             <field name="fld_int" column="PRIMITIVEINT"/>
@@ -14,7 +16,9 @@
             <field name="fld_short" column="PRIMITIVESHORT"/>
             <field name="fld_Boolean" column="BOOLEANVAL"/>
             <field name="fld_Byte" column="BYTEVAL"/>
-            <field name="fld_Character" column="CHARACTERVAL"/>
+            <field name="fld_Character">
+                <column name="CHARACTERVAL" jdbc-type="INTEGER"/>
+            </field>
             <field name="fld_Double" column="DOUBLEVAL"/>
             <field name="fld_Float" column="FLOATVAL"/>
             <field name="fld_Integer" column="INTEGERVAL"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm Thu Aug  4 08:39:53 2005
@@ -4,78 +4,222 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Character0" column="CHARACTER0"/>
-            <field name="Character1" column="CHARACTER1"/>
-            <field name="Character102" column="CHARACTER102"/>
-            <field name="Character103" column="CHARACTER103"/>
-            <field name="Character104" column="CHARACTER104"/>
-            <field name="Character108" column="CHARACTER108"/>
-            <field name="Character109" column="CHARACTER109"/>
-            <field name="Character11" column="CHARACTER11"/>
-            <field name="Character110" column="CHARACTER110"/>
-            <field name="Character112" column="CHARACTER112"/>
-            <field name="Character113" column="CHARACTER113"/>
-            <field name="Character114" column="CHARACTER114"/>
-            <field name="Character119" column="CHARACTER119"/>
-            <field name="Character12" column="CHARACTER12"/>
-            <field name="Character120" column="CHARACTER120"/>
-            <field name="Character121" column="CHARACTER121"/>
-            <field name="Character124" column="CHARACTER124"/>
-            <field name="Character125" column="CHARACTER125"/>
-            <field name="Character126" column="CHARACTER126"/>
-            <field name="Character128" column="CHARACTER128"/>
-            <field name="Character129" column="CHARACTER129"/>
-            <field name="Character13" column="CHARACTER13"/>
-            <field name="Character130" column="CHARACTER130"/>
-            <field name="Character138" column="CHARACTER138"/>
-            <field name="Character139" column="CHARACTER139"/>
-            <field name="Character140" column="CHARACTER140"/>
-            <field name="Character16" column="CHARACTER16"/>
-            <field name="Character17" column="CHARACTER17"/>
-            <field name="Character18" column="CHARACTER18"/>
-            <field name="Character2" column="CHARACTER2"/>
-            <field name="Character20" column="CHARACTER20"/>
-            <field name="Character21" column="CHARACTER21"/>
-            <field name="Character22" column="CHARACTER22"/>
-            <field name="Character30" column="CHARACTER30"/>
-            <field name="Character31" column="CHARACTER31"/>
-            <field name="Character32" column="CHARACTER32"/>
-            <field name="Character36" column="CHARACTER36"/>
-            <field name="Character37" column="CHARACTER37"/>
-            <field name="Character38" column="CHARACTER38"/>
-            <field name="Character4" column="CHARACTER4"/>
-            <field name="Character40" column="CHARACTER40"/>
-            <field name="Character41" column="CHARACTER41"/>
-            <field name="Character42" column="CHARACTER42"/>
-            <field name="Character47" column="CHARACTER47"/>
-            <field name="Character48" column="CHARACTER48"/>
-            <field name="Character49" column="CHARACTER49"/>
-            <field name="Character5" column="CHARACTER5"/>
-            <field name="Character52" column="CHARACTER52"/>
-            <field name="Character53" column="CHARACTER53"/>
-            <field name="Character54" column="CHARACTER54"/>
-            <field name="Character56" column="CHARACTER56"/>
-            <field name="Character57" column="CHARACTER57"/>
-            <field name="Character58" column="CHARACTER58"/>
-            <field name="Character6" column="CHARACTER6"/>
-            <field name="Character66" column="CHARACTER66"/>
-            <field name="Character67" column="CHARACTER67"/>
-            <field name="Character68" column="CHARACTER68"/>
-            <field name="Character72" column="CHARACTER72"/>
-            <field name="Character73" column="CHARACTER73"/>
-            <field name="Character74" column="CHARACTER74"/>
-            <field name="Character76" column="CHARACTER76"/>
-            <field name="Character77" column="CHARACTER77"/>
-            <field name="Character78" column="CHARACTER78"/>
-            <field name="Character83" column="CHARACTER83"/>
-            <field name="Character84" column="CHARACTER84"/>
-            <field name="Character85" column="CHARACTER85"/>
-            <field name="Character88" column="CHARACTER88"/>
-            <field name="Character89" column="CHARACTER89"/>
-            <field name="Character90" column="CHARACTER90"/>
-            <field name="Character92" column="CHARACTER92"/>
-            <field name="Character93" column="CHARACTER93"/>
-            <field name="Character94" column="CHARACTER94"/>
+            <field name="Character0">
+                <column name="CHARACTER0" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character1">
+                <column name="CHARACTER1" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character102">
+                <column name="CHARACTER102" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character103">
+                <column name="CHARACTER103" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character104">
+                <column name="CHARACTER104" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character108">
+                <column name="CHARACTER108" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character109">
+                <column name="CHARACTER109" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character11">
+                <column name="CHARACTER11" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character110">
+                <column name="CHARACTER110" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character112">
+                <column name="CHARACTER112" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character113">
+                <column name="CHARACTER113" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character114">
+                <column name="CHARACTER114" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character119">
+                <column name="CHARACTER119" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character12">
+                <column name="CHARACTER12" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character120">
+                <column name="CHARACTER120" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character121">
+                <column name="CHARACTER121" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character124">
+                <column name="CHARACTER124" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character125">
+                <column name="CHARACTER125" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character126">
+                <column name="CHARACTER126" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character128">
+                <column name="CHARACTER128" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character129">
+                <column name="CHARACTER129" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character13">
+                <column name="CHARACTER13" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character130">
+                <column name="CHARACTER130" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character138">
+                <column name="CHARACTER138" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character139">
+                <column name="CHARACTER139" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character140">
+                <column name="CHARACTER140" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character16">
+                <column name="CHARACTER16" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character17">
+                <column name="CHARACTER17" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character18">
+                <column name="CHARACTER18" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character2">
+                <column name="CHARACTER2" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character20">
+                <column name="CHARACTER20" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character21">
+                <column name="CHARACTER21" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character22">
+                <column name="CHARACTER22" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character30">
+                <column name="CHARACTER30" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character31">
+                <column name="CHARACTER31" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character32">
+                <column name="CHARACTER32" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character36">
+                <column name="CHARACTER36" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character37">
+                <column name="CHARACTER37" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character38">
+                <column name="CHARACTER38" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character4">
+                <column name="CHARACTER4" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character40">
+                <column name="CHARACTER40" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character41">
+                <column name="CHARACTER41" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character42">
+                <column name="CHARACTER42" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character47">
+                <column name="CHARACTER47" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character48">
+                <column name="CHARACTER48" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character49">
+                <column name="CHARACTER49" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character5">
+                <column name="CHARACTER5" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character52">
+                <column name="CHARACTER52" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character53">
+                <column name="CHARACTER53" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character54">
+                <column name="CHARACTER54" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character56">
+                <column name="CHARACTER56" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character57">
+                <column name="CHARACTER57" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character58">
+                <column name="CHARACTER58" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character6">
+                <column name="CHARACTER6" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character66">
+                <column name="CHARACTER66" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character67">
+                <column name="CHARACTER67" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character68">
+                <column name="CHARACTER68" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character72">
+                <column name="CHARACTER72" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character73">
+                <column name="CHARACTER73" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character74">
+                <column name="CHARACTER74" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character76">
+                <column name="CHARACTER76" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character77">
+                <column name="CHARACTER77" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character78">
+                <column name="CHARACTER78" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character83">
+                <column name="CHARACTER83" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character84">
+                <column name="CHARACTER84" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character85">
+                <column name="CHARACTER85" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character88">
+                <column name="CHARACTER88" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character89">
+                <column name="CHARACTER89" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character90">
+                <column name="CHARACTER90" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character92">
+                <column name="CHARACTER92" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character93">
+                <column name="CHARACTER93" jdbc-type="INTEGER"/>
+            </field>
+            <field name="Character94">
+                <column name="CHARACTER94" jdbc-type="INTEGER"/>
+            </field>
         </class>
     </package>
 </orm>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -8,58 +8,49 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object1" table="HASHMAP_STR_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object2" table="HASHMAP_STR_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass3" table="HASHMAP_STR_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass4" table="HASHMAP_STR_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass5" table="HASHMAP_STR_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface6"
                    table="HASHMAP_STR_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface7"
                    table="HASHMAP_STR_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface8"
                    table="HASHMAP_STR_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_String9"
                    column="HASHMAP_STR_STRING9"
@@ -197,37 +188,31 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object43" table="HASHMAP_STR_OBJECT43">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass45" table="HASHMAP_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass46" table="HASHMAP_STR_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface48" table="HASHMAP_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface49" table="HASHMAP_STR_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_String51"
                    column="HASHMAP_STR_STRING51"
@@ -321,37 +306,31 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Object86" table="HASHMAP_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass87" table="HASHMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleClass89" table="HASHMAP_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface90" table="HASHMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_SimpleInterface92" table="HASHMAP_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_String93"
                    column="HASHMAP_STR_STRING93"
@@ -360,8 +339,7 @@
             <field name="HashMapOfString_String95" table="HASHMAP_STR_STRING95">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="KEYVALVAL"/>
-                <order column="INDEX"/>
+                <value column="STRINGVAL"/>
             </field>
             <field name="HashMapOfString_Date96"
                    column="HASHMAP_STR_DATE96"
@@ -371,7 +349,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Locale99"
                    column="HASHMAP_STR_LOCALE99"
@@ -381,7 +358,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_BigDecimal102"
                    column="HASHMAP_STR_BIG_DECIMAL102"
@@ -391,7 +367,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_BigInteger105"
                    column="HASHMAP_STR_BIG_INTEGER105"
@@ -401,7 +376,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Byte108"
                    column="HASHMAP_STR_BYTE108"
@@ -411,7 +385,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Double111" 
                    serialized="true"
@@ -421,7 +394,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Float114"
                    column="HASHMAP_STR_FLOAT114">
@@ -430,7 +402,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Integer117"
                    column="HASHMAP_STR_INTEGER117"
@@ -440,7 +411,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Long120"
                    serialized="true"
@@ -450,7 +420,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Short123"
                    column="HASHMAP_STR_SHORT123"
@@ -460,7 +429,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -8,127 +8,106 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
                 <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="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfObject_String8" table="HASHMAP_OBJECT8_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String9" table="HASHMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String10" table="HASHMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String11" table="HASHMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String12" table="HASHMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String13" table="HASHMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String15" table="HASHMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleClass_String17" table="HASHMAP_SIMPLE_CLASS17_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String18" table="HASHMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String19" table="HASHMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String20" table="HASHMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String21" table="HASHMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String22" table="HASHMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String24" table="HASHMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfSimpleInterface_String26" table="HASHMAP_SIMPLE_INTERFACE26_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_String27" column="HASHMAP_STRING27_STR"
                    serialized="true">
@@ -152,7 +131,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfDate_String36" column="HASHMAP_DATE36_STR"
                    serialized="true">
@@ -176,7 +154,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfBigDecimal_String45" column="HASHMAP_BIG_DECIMAL45_STR"
                    serialized="true">
@@ -201,11 +178,10 @@
                 <key>
                     <column name="KEYVAL"
                             jdbc-type="DECIMAL"
-                            length="11"
-                            scale="4"/>
+                            length="17"
+                            scale="6"/>
                 </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfBigInteger_String54" column="HASHMAP_BIG_INTEGER54_STR"
                    serialized="true">
@@ -229,7 +205,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfByte_String63" column="HASHMAP_BYTE63_STR"
                    serialized="true">
@@ -253,7 +228,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfDouble_String72" column="HASHMAP_DOUBLE72_STR"
                    serialized="true">
@@ -277,7 +251,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfFloat_String81" column="HASHMAP_FLOAT81_STR"
                    serialized="true">
@@ -301,7 +274,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfInteger_String90" column="HASHMAP_INTEGER90_STR"
                    serialized="true">
@@ -325,7 +297,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfLong_String99" column="HASHMAP_LONG99_STR"
                    serialized="true">
@@ -349,7 +320,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashMapOfShort_String108" column="HASHMAP_SHORT108_STR"
                    serialized="true">
@@ -372,7 +342,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -7,52 +7,42 @@
             <field name="HashSetOfObject0" table="HASHSET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfObject1" table="HASHSET_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfObject2" table="HASHSET_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <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">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <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">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfSimpleInterface7" table="HASHSET_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfSimpleInterface8" table="HASHSET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfString9" table="HASHSET_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfString10"
                    column="HASHSET_OF_STRING10"
@@ -61,12 +51,10 @@
             <field name="HashSetOfString11" table="HASHSET_OF_STRING11">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDate12" table="HASHSET_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDate13" column="HASHSET_OF_DATE13"
             serialized="true">
@@ -74,12 +62,10 @@
             <field name="HashSetOfDate14" table="HASHSET_OF_DATE14">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLocale15" table="HASHSET_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLocale16" column="HASHSET_OF_LOCALE16"
             serialized="true">
@@ -87,12 +73,10 @@
             <field name="HashSetOfLocale17" table="HASHSET_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfBigDecimal18" table="HASHSET_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfBigDecimal19" column="HASHSET_OF_BIG_DECIMAL19"
             serialized="true">
@@ -100,12 +84,10 @@
             <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">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22"
             serialized="true">
@@ -113,12 +95,10 @@
             <field name="HashSetOfBigInteger23" table="HASHSET_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfByte24" table="HASHSET_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfByte25" column="HASHSET_OF_BYTE25"
             serialized="true">
@@ -126,12 +106,10 @@
             <field name="HashSetOfByte26" table="HASHSET_OF_BYTE26">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDouble27" table="HASHSET_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDouble28" column="HASHSET_OF_DOUBLE28"
             serialized="true">
@@ -139,12 +117,10 @@
             <field name="HashSetOfDouble29" table="HASHSET_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfFloat30" table="HASHSET_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfFloat31" column="HASHSET_OF_FLOAT31"
                    serialized="true">
@@ -152,12 +128,10 @@
             <field name="HashSetOfFloat32" table="HASHSET_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfInteger33" table="HASHSET_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfInteger34" column="HASHSET_OF_INTEGER34"
                    serialized="true">
@@ -165,12 +139,10 @@
             <field name="HashSetOfInteger35" table="HASHSET_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLong36" table="HASHSET_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLong37" column="HASHSET_OF_LONG37"
                    serialized="true">
@@ -178,12 +150,10 @@
             <field name="HashSetOfLong38" table="HASHSET_OF_LONG38">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfShort39" table="HASHSET_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40"
                    serialized="true">
@@ -191,7 +161,6 @@
             <field name="HashSetOfShort41" table="HASHSET_OF_SHORT41">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -8,55 +8,46 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Object1" table="HASHTBL_STR_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Object2" table="HASHTBL_STR_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass3" table="HASHTBL_STR_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass4" table="HASHTBL_STR_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass5" table="HASHTBL_STR_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface6" table="HASHTBL_STR_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <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"
                    serialized="true">
@@ -157,41 +148,35 @@
             <field name="HashtableOfString_Short41" column="HASHTBL_STR_SHORT41"
                    serialized="true">
             </field>
-  <field name="HashtableOfString_Object42" table="HASHTBL_STR_OBJECT42">
+            <field name="HashtableOfString_Object42" table="HASHTBL_STR_OBJECT42">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Object43" table="HASHTBL_STR_OBJECT43">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass45" table="HASHTBL_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass46" table="HASHTBL_STR_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface48" table="HASHTBL_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface49" table="HASHTBL_STR_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_String51" column="HASHTBL_STR_STRING51"
                    serialized="true">
@@ -263,37 +248,31 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Object86" table="HASHTBL_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass87" table="HASHTBL_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleClass89" table="HASHTBL_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface90" table="HASHTBL_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_SimpleInterface92" table="HASHTBL_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_String93" column="HASHTBL_STR_STRING93"
                    serialized="true">
@@ -301,8 +280,7 @@
             <field name="HashtableOfString_String95" table="HASHTBL_STR_STRING95">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="KEYVALVAL"/>
-                <order column="INDEX"/>
+                <value column="STRINGVAL"/>
             </field>
             <field name="HashtableOfString_Date96" column="HASHTBL_STR_DATE96"
                    serialized="true">
@@ -311,7 +289,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Locale99" column="HASHTBL_STR_LOCALE99"
                    serialized="true">
@@ -320,7 +297,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_BigDecimal102" column="HASHTBL_STR_BIG_DECIMAL102"
                    serialized="true">
@@ -329,7 +305,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_BigInteger105" column="HASHTBL_STR_BIG_INTEGER105">
             </field>
@@ -337,7 +312,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Byte108" column="HASHTBL_STR_BYTE108">
             </field>
@@ -345,7 +319,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Double111" column="HASHTBL_STR_DOUBLE111"
                    serialized="true">
@@ -354,7 +327,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Float114" column="HASHTBL_STR_FLOAT114"
                    serialized="true">
@@ -363,7 +335,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Integer117" column="HASHTBL_STR_INTEGER117"
                    serialized="true">
@@ -372,7 +343,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Long120" column="HASHTBL_STR_LONG120"
                    serialized="true">
@@ -381,7 +351,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Short123" column="HASHTBL_STR_SHORT123"
                    serialized="true">
@@ -390,7 +359,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -8,127 +8,106 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String1" table="HASHTBL_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String2" table="HASHTBL_OBJECT2_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String3" table="HASHTBL_OBJECT3_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String4" table="HASHTBL_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String6" table="HASHTBL_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfObject_String8" table="HASHTBL_OBJECT8_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String9" table="HASHTBL_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String10" table="HASHTBL_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String11" table="HASHTBL_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String12" table="HASHTBL_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String13" table="HASHTBL_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String15" table="HASHTBL_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleClass_String17" table="HASHTBL_SIMPLE_CLASS17_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPCLSREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String18" table="HASHTBL_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String19" table="HASHTBL_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYPINTREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String20" table="HASHTBL_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String21" table="HASHTBL_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String22" table="HASHTBL_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String24" table="HASHTBL_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfSimpleInterface_String26" table="HASHTBL_SIMPLE_INTERFACE26_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYPINTREF"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_String27" column="HASHTBL_STRING27_STR"
                    serialized="true">
@@ -152,7 +131,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfDate_String36" column="HASHTBL_DATE36_STR"
                    serialized="true">
@@ -176,7 +154,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfBigDecimal_String45" column="HASHTBL_BIG_DECIMAL45_STR"
                    serialized="true">
@@ -201,11 +178,10 @@
                 <key>
                     <column name="KEYVAL"
                             jdbc-type="DECIMAL"
-                            length="11"
-                            scale="4"/>
+                            length="17"
+                            scale="6"/>
                 </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfBigInteger_String54" column="HASHTBL_BIG_INTEGER54_STR"
                    serialized="true">
@@ -229,7 +205,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfByte_String63" column="HASHTBL_BYTE63_STR"
                    serialized="true">
@@ -253,7 +228,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfDouble_String72" column="HASHTBL_DOUBLE72_STR"
                    serialized="true">
@@ -277,7 +251,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfFloat_String81" column="HASHTBL_FLOAT81_STR"
                    serialized="true">
@@ -301,7 +274,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfInteger_String90" column="HASHTBL_INTEGER90_STR"
                    serialized="true">
@@ -325,7 +297,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfLong_String99" column="HASHTBL_LONG99_STR"
                    serialized="true">
@@ -348,7 +319,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="HashtableOfShort_String108" column="HASHTBL_SHORT108_STR"
                    serialized="true">
@@ -372,7 +342,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/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=227413&r1=227412&r2=227413&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 Thu Aug  4 08:39:53 2005
@@ -8,55 +8,46 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object1" table="MAP_OF_STRING_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object2" table="MAP_OF_STRING_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <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="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass4" table="MAP_OF_STRING_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <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="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface6" table="MAP_OF_STRING_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
-            <field name="MapOfString_SimpleInterface7" column="MAP_OF_STRING_SIMPLE_INTERFACE7">
+            <field name="MapOfString_SimpleInterface7" table="MAP_OF_STRING_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
-            <field name="MapOfString_SimpleInterface8" column="MAP_OF_STRING_SIMPLE_INTERFACE8" >
+            <field name="MapOfString_SimpleInterface8" table="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"
                    serialized="true">
@@ -157,41 +148,35 @@
             <field name="MapOfString_Short41" column="MAP_OF_STRING_SHORT41"
                    serialized="true">
             </field>
-  <field name="MapOfString_Object42" table="MAP_OF_STRING_OBJECT42">
+           <field name="MapOfString_Object42" table="MAP_OF_STRING_OBJECT42">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object43" table="MAP_OF_STRING_OBJECT43">
                 <join column="IDENTIFIER"/>
                 <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="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass46" table="MAP_OF_STRING_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
                 <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="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface49" table="MAP_OF_STRING_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_String51" column="MAP_OF_STRING_STRING51"
                    serialized="true">
@@ -263,37 +248,31 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Object86" table="MAP_OF_STRING_OBJECT86">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleClass87" table="MAP_OF_STRING_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <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="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_SimpleInterface90" table="MAP_OF_STRING_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <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="KEYVAL"/>
                 <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_String93" column="MAP_OF_STRING_STRING93"
                    serialized="true">
@@ -301,8 +280,7 @@
             <field name="MapOfString_String95" table="MAP_OF_STRING_STRING95">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="KEYVALVAL"/>
-                <order column="INDEX"/>
+                <value column="STRINGVAL"/>
             </field>
             <field name="MapOfString_Date96" column="MAP_OF_STRING_DATE96"
                    serialized="true">
@@ -311,7 +289,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Locale99" column="MAP_OF_STRING_LOCALE99"
                    serialized="true">
@@ -320,7 +297,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_BigDecimal102" column="MAP_OF_STRING_BIG_DECIMAL102"
                    serialized="true">
@@ -329,7 +305,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_BigInteger105" column="MAP_OF_STRING_BIG_INTEGER105"
                    serialized="true">
@@ -338,7 +313,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Byte108" column="MAP_OF_STRING_BYTE108"
                    serialized="true">
@@ -347,7 +321,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Double111" column="MAP_OF_STRING_DOUBLE111"
                    serialized="true">
@@ -356,7 +329,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Float114" column="MAP_OF_STRING_FLOAT114"
                    serialized="true">
@@ -365,7 +337,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Integer117" column="MAP_OF_STRING_INTEGER117"
                    serialized="true">
@@ -374,7 +345,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Long120" column="MAP_OF_STRING_LONG120"
                    serialized="true">
@@ -383,7 +353,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_Short123" column="MAP_OF_STRING_SHORT123"
                    serialized="true">
@@ -392,7 +361,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>