Return-Path: 
 <jdo-commits-return-626-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 52967 invoked from network); 8 Jun 2005 18:06:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 8 Jun 2005 18:06:55 -0000
Received: (qmail 41629 invoked by uid 500); 8 Jun 2005 18:06:52 -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 41240 invoked by uid 99); 8 Jun 2005 18:06:52 -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 minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 08 Jun 2005 11:06:47 -0700
Received: (qmail 52841 invoked by uid 65534); 8 Jun 2005 18:06:26 -0000
Message-ID: <20050608180626.52839.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r189613 [2/2] - in /incubator/jdo/trunk/tck20/test/orm:
 applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
 applicationidentity/org/apache/jdo/tck/pc/inheritance/
 datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
 datastoreidentity/org/apache/jdo/tck/pc/inheritance/
Date: Wed, 08 Jun 2005 18:06:24 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/j=
do/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datas=
toreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-der=
by.orm?rev=3D189613&r1=3D189612&r2=3D189613&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 Jun  8 11:06:22 2005
@@ -7,164 +7,164 @@
             <field name=3D"identifier" column=3D"IDENTIFIER"/>
             <field name=3D"MapOfObject_String0" table=3D"MAP_OF_OBJECT0_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String1" table=3D"MAP_OF_OBJECT1_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String2" table=3D"MAP_OF_OBJECT2_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String3" table=3D"MAP_OF_OBJECT3_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String4" table=3D"MAP_OF_OBJECT4_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String5" table=3D"MAP_OF_OBJECT5_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String6" table=3D"MAP_OF_OBJECT6_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String7" table=3D"MAP_OF_OBJECT7_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfObject_String8" table=3D"MAP_OF_OBJECT8_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String9" table=3D"MAP_OF_SIMPL=
E_CLASS9_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String10" table=3D"MAP_OF_SIMP=
LE_CLASS10_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String11" table=3D"MAP_OF_SIMP=
LE_CLASS11_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String12" table=3D"MAP_OF_SIMP=
LE_CLASS12_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String13" table=3D"MAP_OF_SIMP=
LE_CLASS13_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String14" table=3D"MAP_OF_SIMP=
LE_CLASS14_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String15" table=3D"MAP_OF_SIMP=
LE_CLASS15_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String16" table=3D"MAP_OF_SIMP=
LE_CLASS16_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleClass_String17" table=3D"MAP_OF_SIMP=
LE_CLASS17_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String18" table=3D"MAP_OF_=
SIMPLE_INTERFACE18_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String19" table=3D"MAP_OF_=
SIMPLE_INTERFACE19_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String20" table=3D"MAP_OF_=
SIMPLE_INTERFACE20_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String21" table=3D"MAP_OF_=
SIMPLE_INTERFACE21_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String22" table=3D"MAP_OF_=
SIMPLE_INTERFACE22_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String23" table=3D"MAP_OF_=
SIMPLE_INTERFACE23_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String24" table=3D"MAP_OF_=
SIMPLE_INTERFACE24_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String25" table=3D"MAP_OF_=
SIMPLE_INTERFACE25_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfSimpleInterface_String26" table=3D"MAP_OF_=
SIMPLE_INTERFACE26_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfString_String27" column=3D"MAP_OF_STRING27=
_STRING">
@@ -185,8 +185,8 @@
             </field>
             <field name=3D"MapOfString_String35" table=3D"MAP_OF_STRING35_=
STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"STRINGVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfDate_String36" column=3D"MAP_OF_DATE36_STR=
ING">
@@ -207,8 +207,8 @@
             </field>
             <field name=3D"MapOfDate_String44" table=3D"MAP_OF_DATE44_STRI=
NG">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"DATEVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfBigDecimal_String45" column=3D"MAP_OF_BIG_=
DECIMAL45_STRING">
@@ -229,8 +229,10 @@
             </field>
             <field name=3D"MapOfBigDecimal_String53" table=3D"MAP_OF_BIG_D=
ECIMAL53_STRING">
                 <join column=3D"IDENTIFIER"/>
+                <key>
+                    <column name=3D"BIG_DECIMALVAL" jdbc-type=3D"DECIMAL" =
length=3D"11" scale=3D"4"/>
+                </key>
                 <value column=3D"STRING"/>
-                <key column=3D"BIG_DECIMALVAL" jdbc-type=3D"DECIMAL" lengt=
h=3D"11" scale=3D"4"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfBigInteger_String54" column=3D"MAP_OF_BIG_=
INTEGER54_STRING">
@@ -251,8 +253,8 @@
             </field>
             <field name=3D"MapOfBigInteger_String62" table=3D"MAP_OF_BIG_I=
NTEGER62_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"BIG_INTEGERVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfByte_String63" column=3D"MAP_OF_BYTE63_STR=
ING">
@@ -273,8 +275,8 @@
             </field>
             <field name=3D"MapOfByte_String71" table=3D"MAP_OF_BYTE71_STRI=
NG">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"BYTEVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfDouble_String72" column=3D"MAP_OF_DOUBLE72=
_STRING">
@@ -295,8 +297,8 @@
             </field>
             <field name=3D"MapOfDouble_String80" table=3D"MAP_OF_DOUBLE80_=
STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"DOUBLEVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfFloat_String81" column=3D"MAP_OF_FLOAT81_S=
TRING">
@@ -317,8 +319,8 @@
             </field>
             <field name=3D"MapOfFloat_String89" table=3D"MAP_OF_FLOAT89_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"FLOATVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfInteger_String90" column=3D"MAP_OF_INTEGER=
90_STRING">
@@ -339,8 +341,8 @@
             </field>
             <field name=3D"MapOfInteger_String98" table=3D"MAP_OF_INTEGER9=
8_STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"INTEGERVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfLong_String99" column=3D"MAP_OF_LONG99_STR=
ING">
@@ -361,8 +363,8 @@
             </field>
             <field name=3D"MapOfLong_String107" table=3D"MAP_OF_LONG107_ST=
RING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"LONGVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"MapOfShort_String108" column=3D"MAP_OF_SHORT108=
_STRING">
@@ -383,8 +385,8 @@
             </field>
             <field name=3D"MapOfShort_String116" table=3D"MAP_OF_SHORT116_=
STRING">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SHORTVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/j=
do/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datas=
toreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections=
-derby.orm?rev=3D189613&r1=3D189612&r2=3D189613&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 Jun  8 11:06:22 =
2005
@@ -7,164 +7,164 @@
             <field name=3D"identifier" column=3D"IDENTIFIER"/>
             <field name=3D"TreeMapOfObject_String0" table=3D"TREEMAP_OBJEC=
T0_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String1" table=3D"TREEMAP_OBJEC=
T1_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String2" table=3D"TREEMAP_OBJEC=
T2_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String3" table=3D"TREEMAP_OBJEC=
T3_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String4" table=3D"TREEMAP_OBJEC=
T4_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String5" table=3D"TREEMAP_OBJEC=
T5_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String6" table=3D"TREEMAP_OBJEC=
T6_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String7" table=3D"TREEMAP_OBJEC=
T7_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfObject_String8" table=3D"TREEMAP_OBJEC=
T8_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"OBJREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String9" table=3D"TREEMAP_=
SIMPLE_CLASS9_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String10" table=3D"TREEMAP=
_SIMPLE_CLASS10_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String11" table=3D"TREEMAP=
_SIMPLE_CLASS11_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String12" table=3D"TREEMAP=
_SIMPLE_CLASS12_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String13" table=3D"TREEMAP=
_SIMPLE_CLASS13_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String14" table=3D"TREEMAP=
_SIMPLE_CLASS14_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String15" table=3D"TREEMAP=
_SIMPLE_CLASS15_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String16" table=3D"TREEMAP=
_SIMPLE_CLASS16_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleClass_String17" table=3D"TREEMAP=
_SIMPLE_CLASS17_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPCLSREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String18" table=3D"TRE=
EMAP_SIMPLE_INTERFACE18_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String19" table=3D"TRE=
EMAP_SIMPLE_INTERFACE19_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String20" table=3D"TRE=
EMAP_SIMPLE_INTERFACE20_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String21" table=3D"TRE=
EMAP_SIMPLE_INTERFACE21_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String22" table=3D"TRE=
EMAP_SIMPLE_INTERFACE22_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String23" table=3D"TRE=
EMAP_SIMPLE_INTERFACE23_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String24" table=3D"TRE=
EMAP_SIMPLE_INTERFACE24_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String25" table=3D"TRE=
EMAP_SIMPLE_INTERFACE25_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfSimpleInterface_String26" table=3D"TRE=
EMAP_SIMPLE_INTERFACE26_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SIMPINTREF"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfString_String27" column=3D"TREEMAP_STR=
ING27_STR">
@@ -185,8 +185,8 @@
             </field>
             <field name=3D"TreeMapOfString_String35" table=3D"TREEMAP_STRI=
NG35_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"STRINGVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfDate_String36" column=3D"TREEMAP_DATE3=
6_STR">
@@ -207,8 +207,8 @@
             </field>
             <field name=3D"TreeMapOfDate_String44" table=3D"TREEMAP_DATE44=
_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"DATEVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfBigDecimal_String45" column=3D"TREEMAP=
_BIG_DECIMAL45_STR">
@@ -229,8 +229,10 @@
             </field>
             <field name=3D"TreeMapOfBigDecimal_String53" table=3D"TREEMAP_=
BIG_DECIMAL53_STR">
                 <join column=3D"IDENTIFIER"/>
+                <key>
+                    <column name=3D"BIG_DECIMALVAL" jdbc-type=3D"DECIMAL" =
length=3D"11" scale=3D"4"/>
+                </key>
                 <value column=3D"STRING"/>
-                <key column=3D"BIG_DECIMALVAL" jdbc-type=3D"DECIMAL" lengt=
h=3D"11" scale=3D"4"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfBigInteger_String54" column=3D"TREEMAP=
_BIG_INTEGER54_STR">
@@ -251,8 +253,8 @@
             </field>
             <field name=3D"TreeMapOfBigInteger_String62" table=3D"TREEMAP_=
BIG_INTEGER62_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"BIG_INTEGERVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfByte_String63" column=3D"TREEMAP_BYTE6=
3_STR">
@@ -273,8 +275,8 @@
             </field>
             <field name=3D"TreeMapOfByte_String71" table=3D"TREEMAP_BYTE71=
_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"BYTEVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfDouble_String72" column=3D"TREEMAP_DOU=
BLE72_STR">
@@ -295,8 +297,8 @@
             </field>
             <field name=3D"TreeMapOfDouble_String80" table=3D"TREEMAP_DOUB=
LE80_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"DOUBLEVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfFloat_String81" column=3D"TREEMAP_FLOA=
T81_STR">
@@ -317,8 +319,8 @@
             </field>
             <field name=3D"TreeMapOfFloat_String89" table=3D"TREEMAP_FLOAT=
89_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"FLOATVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfInteger_String90" column=3D"TREEMAP_IN=
TEGER90_STR">
@@ -339,8 +341,8 @@
             </field>
             <field name=3D"TreeMapOfInteger_String98" table=3D"TREEMAP_INT=
EGER98_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"INTEGERVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfLong_String99" column=3D"TREEMAP_LONG9=
9_STR">
@@ -361,8 +363,8 @@
             </field>
             <field name=3D"TreeMapOfLong_String107" table=3D"TREEMAP_LONG1=
07_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"LONGVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
             <field name=3D"TreeMapOfShort_String108" column=3D"TREEMAP_SHO=
RT108_STR">
@@ -383,8 +385,8 @@
             </field>
             <field name=3D"TreeMapOfShort_String116" table=3D"TREEMAP_SHOR=
T116_STR">
                 <join column=3D"IDENTIFIER"/>
-                <value column=3D"STRING"/>
                 <key column=3D"SHORTVAL"/>
+                <value column=3D"STRING"/>
                 <order column=3D"INDEX"/>
             </field>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/j=
do/tck/pc/inheritance/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datas=
toreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm?rev=3D1896=
13&r1=3D189612&r2=3D189613&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck=
/pc/inheritance/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck=
/pc/inheritance/package-derby.orm Wed Jun  8 11:06:22 2005
@@ -68,7 +68,7 @@
=20
         <class name=3D"TopPersistE">
             <inheritance strategy=3D"superclass-table"/>
-            <field name=3D"floatE" persistence-modifier=3D"transactional"/>
+            <field name=3D"floatE" column=3D"FLOAT_E"/>
         </class>
=20
         <class name=3D"TopPersistF">