db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r202081 [1/3] - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Date Mon, 27 Jun 2005 21:18:07 GMT
Author: mcaisse
Date: Mon Jun 27 14:18:06 2005
New Revision: 202081

URL: http://svn.apache.org/viewcvs?rev=202081&view=rev
Log:
JDO-65 Collections of wrapper types should default to embedded-element=false

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -8,32 +8,33 @@
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="ArrayOfObject0" column="ARRAY_OF_OBJECT0"/>
-            <field name="ArrayOfObject1" column="ARRAY_OF_OBJECT1"/>
+            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1"/>
             <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"/>
-            <field name="ArrayOfSimpleClass3" column="ARRAY_OF_SIMPLE_CLASS3"/>
+            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3"/>
             <field name="ArrayOfSimpleInterface4" column="ARRAY_OF_SIMPLE_INTERFACE4"/>
-            <field name="ArrayOfSimpleInterface5" column="ARRAY_OF_SIMPLE_INTERFACE5"/>
+            <field name="ArrayOfSimpleInterface5" table="ARRAY_OF_SIMPLE_INTERFACE5"/>
             <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
-            <field name="ArrayOfString7" column="ARRAY_OF_STRING7"/>
+            <field name="ArrayOfString7" table="ARRAY_OF_STRING7"/>
             <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
-            <field name="ArrayOfDate9" column="ARRAY_OF_DATE9"/>
+            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9"/>
             <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
-            <field name="ArrayOfLocale11" column="ARRAY_OF_LOCALE11"/>
+            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11"/>
             <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
-            <field name="ArrayOfBigDecimal13" column="ARRAY_OF_BIG_DECIMAL13"/>
+            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13"/>
             <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
-            <field name="ArrayOfBigInteger15" column="ARRAY_OF_BIG_INTEGER15"/>
+            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15"/>
             <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
-            <field name="ArrayOfByte17" column="ARRAY_OF_BYTE17"/>
+            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17"/>
             <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
-            <field name="ArrayOfDouble19" column="ARRAY_OF_DOUBLE19"/>
+            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19"/>
             <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
-            <field name="ArrayOfFloat21" column="ARRAY_OF_FLOAT21"/>
+            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21"/>
             <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
-            <field name="ArrayOfInteger23" column="ARRAY_OF_INTEGER23"/>
-            <field name="ArrayOfLong25" column="ARRAY_OF_LONG25"/>
+            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23"/>
+            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
+            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25"/>
             <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
-            <field name="ArrayOfShort27" column="ARRAY_OF_SHORT27"/>
+            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27"/>
         </class>
     </package>
 </orm>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfString9" column="ARRAYLIST_OF_STRING9">
+            <field name="ArrayListOfString9" table="ARRAYLIST_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfString10" column="ARRAYLIST_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDate12" column="ARRAYLIST_OF_DATE12">
+            <field name="ArrayListOfDate12" table="ARRAYLIST_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfDate13" column="ARRAYLIST_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLocale15" column="ARRAYLIST_OF_LOCALE15">
+            <field name="ArrayListOfLocale15" table="ARRAYLIST_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfLocale16" column="ARRAYLIST_OF_LOCALE16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigDecimal18" column="ARRAYLIST_OF_BIG_DECIMAL18">
+            <field name="ArrayListOfBigDecimal18" table="ARRAYLIST_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfBigDecimal19" column="ARRAYLIST_OF_BIG_DECIMAL19">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigInteger21" column="ARRAYLIST_OF_BIG_INTEGER21">
+            <field name="ArrayListOfBigInteger21" table="ARRAYLIST_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfBigInteger22" column="ARRAYLIST_OF_BIG_INTEGER22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfByte24" column="ARRAYLIST_OF_BYTE24">
+            <field name="ArrayListOfByte24" table="ARRAYLIST_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfByte25" column="ARRAYLIST_OF_BYTE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDouble27" column="ARRAYLIST_OF_DOUBLE27">
+            <field name="ArrayListOfDouble27" table="ARRAYLIST_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfDouble28" column="ARRAYLIST_OF_DOUBLE28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfFloat30" column="ARRAYLIST_OF_FLOAT30">
+            <field name="ArrayListOfFloat30" table="ARRAYLIST_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfFloat31" column="ARRAYLIST_OF_FLOAT31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfInteger33" column="ARRAYLIST_OF_INTEGER33">
+            <field name="ArrayListOfInteger33" table="ARRAYLIST_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfInteger34" column="ARRAYLIST_OF_INTEGER34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLong36" column="ARRAYLIST_OF_LONG36">
+            <field name="ArrayListOfLong36" table="ARRAYLIST_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfLong37" column="ARRAYLIST_OF_LONG37">
             </field>
@@ -139,7 +169,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfShort39" column="ARRAYLIST_OF_SHORT39">
+            <field name="ArrayListOfShort39" table="ARRAYLIST_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -40,7 +40,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfString9" column="COLLECTION_OF_STRING9">
+            <field name="CollectionOfString9" table="COLLECTION_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
             </field>
             <field name="CollectionOfString10" column="COLLECTION_OF_STRING10">
             </field>
@@ -48,7 +50,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfDate12" column="COLLECTION_OF_DATE12">
+            <field name="CollectionOfDate12" table="COLLECTION_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
             </field>
             <field name="CollectionOfDate13" column="COLLECTION_OF_DATE13">
             </field>
@@ -56,7 +60,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfLocale15" column="COLLECTION_OF_LOCALE15">
+            <field name="CollectionOfLocale15" table="COLLECTION_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
             </field>
             <field name="CollectionOfLocale16" column="COLLECTION_OF_LOCALE16">
             </field>
@@ -64,7 +70,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal18" column="COLLECTION_OF_BIG_DECIMAL18">
+            <field name="CollectionOfBigDecimal18" table="COLLECTION_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
             </field>
             <field name="CollectionOfBigDecimal19" column="COLLECTION_OF_BIG_DECIMAL19">
             </field>
@@ -72,7 +80,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigInteger21" column="COLLECTION_OF_BIG_INTEGER21">
+            <field name="CollectionOfBigInteger21" table="COLLECTION_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
             </field>
             <field name="CollectionOfBigInteger22" column="COLLECTION_OF_BIG_INTEGER22">
             </field>
@@ -80,7 +90,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfByte24" column="COLLECTION_OF_BYTE24">
+            <field name="CollectionOfByte24" table="COLLECTION_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
             </field>
             <field name="CollectionOfByte25" column="COLLECTION_OF_BYTE25">
             </field>
@@ -88,7 +100,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfDouble27" column="COLLECTION_OF_DOUBLE27">
+            <field name="CollectionOfDouble27" table="COLLECTION_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
             </field>
             <field name="CollectionOfDouble28" column="COLLECTION_OF_DOUBLE28">
             </field>
@@ -96,7 +110,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfFloat30" column="COLLECTION_OF_FLOAT30">
+            <field name="CollectionOfFloat30" table="COLLECTION_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
             </field>
             <field name="CollectionOfFloat31" column="COLLECTION_OF_FLOAT31">
             </field>
@@ -104,7 +120,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfInteger33" column="COLLECTION_OF_INTEGER33">
+            <field name="CollectionOfInteger33" table="COLLECTION_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
             </field>
             <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34">
             </field>
@@ -112,7 +130,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfLong36" column="COLLECTION_OF_LONG36">
+            <field name="CollectionOfLong36" table="COLLECTION_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
             </field>
             <field name="CollectionOfLong37" column="COLLECTION_OF_LONG37">
             </field>
@@ -120,7 +140,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfShort39" column="COLLECTION_OF_SHORT39">
+            <field name="CollectionOfShort39" table="COLLECTION_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
             </field>
             <field name="CollectionOfShort40" column="COLLECTION_OF_SHORT40">
             </field>

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=202081&r1=202080&r2=202081&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 Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfString9" column="HASHSET_OF_STRING9">
+            <field name="HashSetOfString9" table="HASHSET_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfString10" column="HASHSET_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfDate12" column="HASHSET_OF_DATE12">
+            <field name="HashSetOfDate12" table="HASHSET_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDate13" column="HASHSET_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfLocale15" column="HASHSET_OF_LOCALE15">
+            <field name="HashSetOfLocale15" table="HASHSET_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLocale16" column="HASHSET_OF_LOCALE16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigDecimal18" column="HASHSET_OF_BIG_DECIMAL18">
+            <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_DECIMAL18">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigInteger21" column="HASHSET_OF_BIG_INTEGER21">
+            <field name="HashSetOfBigInteger21" table="HASHSET_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfByte24" column="HASHSET_OF_BYTE24">
+            <field name="HashSetOfByte24" table="HASHSET_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfByte25" column="HASHSET_OF_BYTE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfDouble27" column="HASHSET_OF_DOUBLE27">
+            <field name="HashSetOfDouble27" table="HASHSET_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDouble28" column="HASHSET_OF_DOUBLE28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfFloat30" column="HASHSET_OF_FLOAT30">
+            <field name="HashSetOfFloat30" table="HASHSET_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfFloat31" column="HASHSET_OF_FLOAT31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfInteger33" column="HASHSET_OF_INTEGER33">
+            <field name="HashSetOfInteger33" table="HASHSET_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfInteger34" column="HASHSET_OF_INTEGER34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfLong36" column="HASHSET_OF_LONG36">
+            <field name="HashSetOfLong36" table="HASHSET_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLong37" column="HASHSET_OF_LONG37">
             </field>
@@ -139,7 +169,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfShort39" column="HASHSET_OF_SHORT39">
+            <field name="HashSetOfShort39" table="HASHSET_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfString9" column="LINKEDLIST_OF_STRING9">
+            <field name="LinkedListOfString9" table="LINKEDLIST_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfString10" column="LINKEDLIST_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfDate12" column="LINKEDLIST_OF_DATE12">
+            <field name="LinkedListOfDate12" table="LINKEDLIST_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfDate13" column="LINKEDLIST_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLocale15" column="LINKEDLIST_OF_LOCALE15">
+            <field name="LinkedListOfLocale15" table="LINKEDLIST_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfLocale16" column="LINKEDLIST_OF_LOCALE16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfBigDecimal18" column="LINKEDLIST_OF_BIG_DECIMAL18">
+            <field name="LinkedListOfBigDecimal18" table="LINKEDLIST_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfBigDecimal19" column="LINKEDLIST_OF_BIG_DECIMAL19">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfBigInteger21" column="LINKEDLIST_OF_BIG_INTEGER21">
+            <field name="LinkedListOfBigInteger21" table="LINKEDLIST_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfBigInteger22" column="LINKEDLIST_OF_BIG_INTEGER22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfByte24" column="LINKEDLIST_OF_BYTE24">
+            <field name="LinkedListOfByte24" table="LINKEDLIST_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfByte25" column="LINKEDLIST_OF_BYTE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfDouble27" column="LINKEDLIST_OF_DOUBLE27">
+            <field name="LinkedListOfDouble27" table="LINKEDLIST_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfDouble28" column="LINKEDLIST_OF_DOUBLE28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfFloat30" column="LINKEDLIST_OF_FLOAT30">
+            <field name="LinkedListOfFloat30" table="LINKEDLIST_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfFloat31" column="LINKEDLIST_OF_FLOAT31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfInteger33" column="LINKEDLIST_OF_INTEGER33">
+            <field name="LinkedListOfInteger33" table="LINKEDLIST_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfInteger34" column="LINKEDLIST_OF_INTEGER34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLong36" column="LINKEDLIST_OF_LONG36">
+            <field name="LinkedListOfLong36" table="LINKEDLIST_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37">
             </field>
@@ -139,7 +169,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfShort39" column="LINKEDLIST_OF_SHORT39">
+            <field name="LinkedListOfShort39" table="LINKEDLIST_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfShort40" column="LINKEDLIST_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfString9" column="LIST_OF_STRING9">
+            <field name="ListOfString9" table="LIST_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfString10" column="LIST_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfDate12" column="LIST_OF_DATE12">
+            <field name="ListOfDate12" table="LIST_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfDate13" column="LIST_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLocale15" column="LIST_OF_LOCALE15">
+            <field name="ListOfLocale15" table="LIST_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfLocale16" column="LIST_OF_LOCALE16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfBigDecimal18" column="LIST_OF_BIG_DECIMAL18">
+            <field name="ListOfBigDecimal18" table="LIST_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfBigDecimal19" column="LIST_OF_BIG_DECIMAL19">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfBigInteger21" column="LIST_OF_BIG_INTEGER21">
+            <field name="ListOfBigInteger21" table="LIST_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfBigInteger22" column="LIST_OF_BIG_INTEGER22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfByte24" column="LIST_OF_BYTE24">
+            <field name="ListOfByte24" table="LIST_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfByte25" column="LIST_OF_BYTE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfDouble27" column="LIST_OF_DOUBLE27">
+            <field name="ListOfDouble27" table="LIST_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfDouble28" column="LIST_OF_DOUBLE28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfFloat30" column="LIST_OF_FLOAT30">
+            <field name="ListOfFloat30" table="LIST_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfFloat31" column="LIST_OF_FLOAT31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfInteger33" column="LIST_OF_INTEGER33">
+            <field name="ListOfInteger33" table="LIST_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfInteger34" column="LIST_OF_INTEGER34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLong36" column="LIST_OF_LONG36">
+            <field name="ListOfLong36" table="LIST_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfLong37" column="LIST_OF_LONG37">
             </field>
@@ -139,7 +169,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfShort39" column="LIST_OF_SHORT39">
+            <field name="ListOfShort39" table="LIST_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ListOfShort40" column="LIST_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfString9" column="SET_OF_STRING9">
+            <field name="SetOfString9" table="SET_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfString10" column="SET_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDate12" column="SET_OF_DATE12">
+            <field name="SetOfDate12" table="SET_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfDate13" column="SET_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLocale15" column="SET_OF_LOCALE15">
+            <field name="SetOfLocale15" table="SET_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfLocale16" column="SET_OF_LOCALE16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigDecimal18" column="SET_OF_BIG_DECIMAL18">
+            <field name="SetOfBigDecimal18" table="SET_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL18">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigInteger21" column="SET_OF_BIG_INTEGER21">
+            <field name="SetOfBigInteger21" table="SET_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfByte24" column="SET_OF_BYTE24">
+            <field name="SetOfByte24" table="SET_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfByte25" column="SET_OF_BYTE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDouble27" column="SET_OF_DOUBLE27">
+            <field name="SetOfDouble27" table="SET_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfDouble28" column="SET_OF_DOUBLE28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfFloat30" column="SET_OF_FLOAT30">
+            <field name="SetOfFloat30" table="SET_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfFloat31" column="SET_OF_FLOAT31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfInteger33" column="SET_OF_INTEGER33">
+            <field name="SetOfInteger33" table="SET_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfInteger34" column="SET_OF_INTEGER34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLong36" column="SET_OF_LONG36">
+            <field name="SetOfLong36" table="SET_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfLong37" column="SET_OF_LONG37">
             </field>
@@ -139,7 +169,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfShort39" column="SET_OF_SHORT39">
+            <field name="SetOfShort39" table="SET_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="SetOfShort40" column="SET_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfString9" column="TREESET_OF_STRING9">
+            <field name="TreeSetOfString9" table="TREESET_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfString10" column="TREESET_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfDate12" column="TREESET_OF_DATE12">
+            <field name="TreeSetOfDate12" table="TREESET_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfDate13" column="TREESET_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfBigDecimal15" column="TREESET_OF_BIG_DECIMAL15">
+            <field name="TreeSetOfBigDecimal15" table="TREESET_OF_BIG_DECIMAL15">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfBigDecimal16" column="TREESET_OF_BIG_DECIMAL16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfBigInteger18" column="TREESET_OF_BIG_INTEGER18">
+            <field name="TreeSetOfBigInteger18" table="TREESET_OF_BIG_INTEGER18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfBigInteger19" column="TREESET_OF_BIG_INTEGER19">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfByte21" column="TREESET_OF_BYTE21">
+            <field name="TreeSetOfByte21" table="TREESET_OF_BYTE21">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfByte22" column="TREESET_OF_BYTE22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfDouble24" column="TREESET_OF_DOUBLE24">
+            <field name="TreeSetOfDouble24" table="TREESET_OF_DOUBLE24">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfDouble25" column="TREESET_OF_DOUBLE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfFloat27" column="TREESET_OF_FLOAT27">
+            <field name="TreeSetOfFloat27" table="TREESET_OF_FLOAT27">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfFloat28" column="TREESET_OF_FLOAT28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfInteger30" column="TREESET_OF_INTEGER30">
+            <field name="TreeSetOfInteger30" table="TREESET_OF_INTEGER30">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfInteger31" column="TREESET_OF_INTEGER31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfLong33" column="TREESET_OF_LONG33">
+            <field name="TreeSetOfLong33" table="TREESET_OF_LONG33">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfLong34" column="TREESET_OF_LONG34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeSetOfShort36" column="TREESET_OF_SHORT36">
+            <field name="TreeSetOfShort36" table="TREESET_OF_SHORT36">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeSetOfShort37" column="TREESET_OF_SHORT37">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -49,7 +49,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfString9" column="VECTOR_OF_STRING9">
+            <field name="VectorOfString9" table="VECTOR_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfString10" column="VECTOR_OF_STRING10">
             </field>
@@ -58,7 +61,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfDate12" column="VECTOR_OF_DATE12">
+            <field name="VectorOfDate12" table="VECTOR_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfDate13" column="VECTOR_OF_DATE13">
             </field>
@@ -67,7 +73,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfLocale15" column="VECTOR_OF_LOCALE15">
+            <field name="VectorOfLocale15" table="VECTOR_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfLocale16" column="VECTOR_OF_LOCALE16">
             </field>
@@ -76,7 +85,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfBigDecimal18" column="VECTOR_OF_BIG_DECIMAL18">
+            <field name="VectorOfBigDecimal18" table="VECTOR_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfBigDecimal19" column="VECTOR_OF_BIG_DECIMAL19">
             </field>
@@ -85,7 +97,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfBigInteger21" column="VECTOR_OF_BIG_INTEGER21">
+            <field name="VectorOfBigInteger21" table="VECTOR_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfBigInteger22" column="VECTOR_OF_BIG_INTEGER22">
             </field>
@@ -94,7 +109,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfByte24" column="VECTOR_OF_BYTE24">
+            <field name="VectorOfByte24" table="VECTOR_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfByte25" column="VECTOR_OF_BYTE25">
             </field>
@@ -103,7 +121,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfDouble27" column="VECTOR_OF_DOUBLE27">
+            <field name="VectorOfDouble27" table="VECTOR_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfDouble28" column="VECTOR_OF_DOUBLE28">
             </field>
@@ -112,7 +133,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfFloat30" column="VECTOR_OF_FLOAT30">
+            <field name="VectorOfFloat30" table="VECTOR_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfFloat31" column="VECTOR_OF_FLOAT31">
             </field>
@@ -121,7 +145,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfInteger33" column="VECTOR_OF_INTEGER33">
+            <field name="VectorOfInteger33" table="VECTOR_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfInteger34" column="VECTOR_OF_INTEGER34">
             </field>
@@ -130,7 +157,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfLong36" column="VECTOR_OF_LONG36">
+            <field name="VectorOfLong36" table="VECTOR_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfLong37" column="VECTOR_OF_LONG37">
             </field>
@@ -139,7 +169,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="VectorOfShort39" column="VECTOR_OF_SHORT39">
+            <field name="VectorOfShort39" table="VECTOR_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="VectorOfShort40" column="VECTOR_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -9,32 +9,33 @@
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="ArrayOfObject0" column="ARRAY_OF_OBJECT0"/>
-            <field name="ArrayOfObject1" column="ARRAY_OF_OBJECT1"/>
+            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1"/>
             <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"/>
-            <field name="ArrayOfSimpleClass3" column="ARRAY_OF_SIMPLE_CLASS3"/>
+            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3"/>
             <field name="ArrayOfSimpleInterface4" column="ARRAY_OF_SIMPLE_INTERFACE4"/>
-            <field name="ArrayOfSimpleInterface5" column="ARRAY_OF_SIMPLE_INTERFACE5"/>
+            <field name="ArrayOfSimpleInterface5" table="ARRAY_OF_SIMPLE_INTERFACE5"/>
             <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
-            <field name="ArrayOfString7" column="ARRAY_OF_STRING7"/>
+            <field name="ArrayOfString7" table="ARRAY_OF_STRING7"/>
             <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
-            <field name="ArrayOfDate9" column="ARRAY_OF_DATE9"/>
+            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9"/>
             <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
-            <field name="ArrayOfLocale11" column="ARRAY_OF_LOCALE11"/>
+            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11"/>
             <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
-            <field name="ArrayOfBigDecimal13" column="ARRAY_OF_BIG_DECIMAL13"/>
+            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13"/>
             <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
-            <field name="ArrayOfBigInteger15" column="ARRAY_OF_BIG_INTEGER15"/>
+            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15"/>
             <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
-            <field name="ArrayOfByte17" column="ARRAY_OF_BYTE17"/>
+            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17"/>
             <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
-            <field name="ArrayOfDouble19" column="ARRAY_OF_DOUBLE19"/>
+            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19"/>
             <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
-            <field name="ArrayOfFloat21" column="ARRAY_OF_FLOAT21"/>
+            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21"/>
             <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
-            <field name="ArrayOfInteger23" column="ARRAY_OF_INTEGER23"/>
-            <field name="ArrayOfLong25" column="ARRAY_OF_LONG25"/>
+            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23"/>
+            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
+            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25"/>
             <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
-            <field name="ArrayOfShort27" column="ARRAY_OF_SHORT27"/>
+            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27"/>
         </class>
     </package>
 </orm>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -50,7 +50,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfString9" column="ARRAYLIST_OF_STRING9">
+            <field name="ArrayListOfString9" table="ARRAYLIST_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfString10" column="ARRAYLIST_OF_STRING10">
             </field>
@@ -59,7 +62,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDate12" column="ARRAYLIST_OF_DATE12">
+            <field name="ArrayListOfDate12" table="ARRAYLIST_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfDate13" column="ARRAYLIST_OF_DATE13">
             </field>
@@ -68,7 +74,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLocale15" column="ARRAYLIST_OF_LOCALE15">
+            <field name="ArrayListOfLocale15" table="ARRAYLIST_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfLocale16" column="ARRAYLIST_OF_LOCALE16">
             </field>
@@ -77,7 +86,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigDecimal18" column="ARRAYLIST_OF_BIG_DECIMAL18">
+            <field name="ArrayListOfBigDecimal18" table="ARRAYLIST_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfBigDecimal19" column="ARRAYLIST_OF_BIG_DECIMAL19">
             </field>
@@ -86,7 +98,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfBigInteger21" column="ARRAYLIST_OF_BIG_INTEGER21">
+            <field name="ArrayListOfBigInteger21" table="ARRAYLIST_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfBigInteger22" column="ARRAYLIST_OF_BIG_INTEGER22">
             </field>
@@ -95,7 +110,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfByte24" column="ARRAYLIST_OF_BYTE24">
+            <field name="ArrayListOfByte24" table="ARRAYLIST_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfByte25" column="ARRAYLIST_OF_BYTE25">
             </field>
@@ -104,7 +122,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfDouble27" column="ARRAYLIST_OF_DOUBLE27">
+            <field name="ArrayListOfDouble27" table="ARRAYLIST_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfDouble28" column="ARRAYLIST_OF_DOUBLE28">
             </field>
@@ -113,7 +134,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfFloat30" column="ARRAYLIST_OF_FLOAT30">
+            <field name="ArrayListOfFloat30" table="ARRAYLIST_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfFloat31" column="ARRAYLIST_OF_FLOAT31">
             </field>
@@ -122,7 +146,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfInteger33" column="ARRAYLIST_OF_INTEGER33">
+            <field name="ArrayListOfInteger33" table="ARRAYLIST_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfInteger34" column="ARRAYLIST_OF_INTEGER34">
             </field>
@@ -131,7 +158,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfLong36" column="ARRAYLIST_OF_LONG36">
+            <field name="ArrayListOfLong36" table="ARRAYLIST_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfLong37" column="ARRAYLIST_OF_LONG37">
             </field>
@@ -140,7 +170,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfShort39" column="ARRAYLIST_OF_SHORT39">
+            <field name="ArrayListOfShort39" table="ARRAYLIST_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -41,7 +41,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfString9" column="COLLECTION_OF_STRING9">
+            <field name="CollectionOfString9" table="COLLECTION_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
             </field>
             <field name="CollectionOfString10" column="COLLECTION_OF_STRING10">
             </field>
@@ -49,7 +51,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfDate12" column="COLLECTION_OF_DATE12">
+            <field name="CollectionOfDate12" table="COLLECTION_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
             </field>
             <field name="CollectionOfDate13" column="COLLECTION_OF_DATE13">
             </field>
@@ -57,7 +61,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfLocale15" column="COLLECTION_OF_LOCALE15">
+            <field name="CollectionOfLocale15" table="COLLECTION_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
             </field>
             <field name="CollectionOfLocale16" column="COLLECTION_OF_LOCALE16">
             </field>
@@ -65,7 +71,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal18" column="COLLECTION_OF_BIG_DECIMAL18">
+            <field name="CollectionOfBigDecimal18" table="COLLECTION_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
             </field>
             <field name="CollectionOfBigDecimal19" column="COLLECTION_OF_BIG_DECIMAL19">
             </field>
@@ -73,7 +81,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigInteger21" column="COLLECTION_OF_BIG_INTEGER21">
+            <field name="CollectionOfBigInteger21" table="COLLECTION_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
             </field>
             <field name="CollectionOfBigInteger22" column="COLLECTION_OF_BIG_INTEGER22">
             </field>
@@ -81,7 +91,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfByte24" column="COLLECTION_OF_BYTE24">
+            <field name="CollectionOfByte24" table="COLLECTION_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
             </field>
             <field name="CollectionOfByte25" column="COLLECTION_OF_BYTE25">
             </field>
@@ -89,7 +101,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfDouble27" column="COLLECTION_OF_DOUBLE27">
+            <field name="CollectionOfDouble27" table="COLLECTION_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
             </field>
             <field name="CollectionOfDouble28" column="COLLECTION_OF_DOUBLE28">
             </field>
@@ -97,7 +111,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfFloat30" column="COLLECTION_OF_FLOAT30">
+            <field name="CollectionOfFloat30" table="COLLECTION_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
             </field>
             <field name="CollectionOfFloat31" column="COLLECTION_OF_FLOAT31">
             </field>
@@ -105,7 +121,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfInteger33" column="COLLECTION_OF_INTEGER33">
+            <field name="CollectionOfInteger33" table="COLLECTION_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
             </field>
             <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34">
             </field>
@@ -113,7 +131,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfLong36" column="COLLECTION_OF_LONG36">
+            <field name="CollectionOfLong36" table="COLLECTION_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
             </field>
             <field name="CollectionOfLong37" column="COLLECTION_OF_LONG37">
             </field>
@@ -121,7 +141,9 @@
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfShort39" column="COLLECTION_OF_SHORT39">
+            <field name="CollectionOfShort39" table="COLLECTION_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
             </field>
             <field name="CollectionOfShort40" column="COLLECTION_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -50,7 +50,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfString9" column="HASHSET_OF_STRING9">
+            <field name="HashSetOfString9" table="HASHSET_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfString10" column="HASHSET_OF_STRING10">
             </field>
@@ -59,7 +62,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfDate12" column="HASHSET_OF_DATE12">
+            <field name="HashSetOfDate12" table="HASHSET_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDate13" column="HASHSET_OF_DATE13">
             </field>
@@ -68,7 +74,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfLocale15" column="HASHSET_OF_LOCALE15">
+            <field name="HashSetOfLocale15" table="HASHSET_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLocale16" column="HASHSET_OF_LOCALE16">
             </field>
@@ -77,7 +86,8 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigDecimal18" column="HASHSET_OF_BIG_DECIMAL18">
+            <field name="HashSetOfBigDecimal18" table="HASHSET_OF_BIG_DECIMAL18">
+                <element column="BIG_DECIMALVAL"/>
             </field>
             <field name="HashSetOfBigDecimal19" column="HASHSET_OF_BIG_DECIMAL18">
             </field>
@@ -86,7 +96,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfBigInteger21" column="HASHSET_OF_BIG_INTEGER21">
+            <field name="HashSetOfBigInteger21" table="HASHSET_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22">
             </field>
@@ -95,7 +108,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfByte24" column="HASHSET_OF_BYTE24">
+            <field name="HashSetOfByte24" table="HASHSET_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfByte25" column="HASHSET_OF_BYTE25">
             </field>
@@ -104,7 +120,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfDouble27" column="HASHSET_OF_DOUBLE27">
+            <field name="HashSetOfDouble27" table="HASHSET_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfDouble28" column="HASHSET_OF_DOUBLE28">
             </field>
@@ -113,7 +132,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfFloat30" column="HASHSET_OF_FLOAT30">
+            <field name="HashSetOfFloat30" table="HASHSET_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfFloat31" column="HASHSET_OF_FLOAT31">
             </field>
@@ -122,7 +144,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfInteger33" column="HASHSET_OF_INTEGER33">
+            <field name="HashSetOfInteger33" table="HASHSET_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfInteger34" column="HASHSET_OF_INTEGER34">
             </field>
@@ -131,7 +156,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfLong36" column="HASHSET_OF_LONG36">
+            <field name="HashSetOfLong36" table="HASHSET_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfLong37" column="HASHSET_OF_LONG37">
             </field>
@@ -140,7 +168,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashSetOfShort39" column="HASHSET_OF_SHORT39">
+            <field name="HashSetOfShort39" table="HASHSET_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40">
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm?rev=202081&r1=202080&r2=202081&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm Mon Jun 27 14:18:06 2005
@@ -50,7 +50,10 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfString9" column="LINKEDLIST_OF_STRING9">
+            <field name="LinkedListOfString9" table="LINKEDLIST_OF_STRING9">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfString10" column="LINKEDLIST_OF_STRING10">
             </field>
@@ -59,7 +62,10 @@
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfDate12" column="LINKEDLIST_OF_DATE12">
+            <field name="LinkedListOfDate12" table="LINKEDLIST_OF_DATE12">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfDate13" column="LINKEDLIST_OF_DATE13">
             </field>
@@ -68,7 +74,10 @@
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLocale15" column="LINKEDLIST_OF_LOCALE15">
+            <field name="LinkedListOfLocale15" table="LINKEDLIST_OF_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfLocale16" column="LINKEDLIST_OF_LOCALE16">
             </field>
@@ -77,7 +86,10 @@
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfBigDecimal18" column="LINKEDLIST_OF_BIG_DECIMAL18">
+            <field name="LinkedListOfBigDecimal18" table="LINKEDLIST_OF_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfBigDecimal19" column="LINKEDLIST_OF_BIG_DECIMAL19">
             </field>
@@ -86,7 +98,10 @@
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfBigInteger21" column="LINKEDLIST_OF_BIG_INTEGER21">
+            <field name="LinkedListOfBigInteger21" table="LINKEDLIST_OF_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfBigInteger22" column="LINKEDLIST_OF_BIG_INTEGER22">
             </field>
@@ -95,7 +110,10 @@
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfByte24" column="LINKEDLIST_OF_BYTE24">
+            <field name="LinkedListOfByte24" table="LINKEDLIST_OF_BYTE24">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfByte25" column="LINKEDLIST_OF_BYTE25">
             </field>
@@ -104,7 +122,10 @@
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfDouble27" column="LINKEDLIST_OF_DOUBLE27">
+            <field name="LinkedListOfDouble27" table="LINKEDLIST_OF_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfDouble28" column="LINKEDLIST_OF_DOUBLE28">
             </field>
@@ -113,7 +134,10 @@
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfFloat30" column="LINKEDLIST_OF_FLOAT30">
+            <field name="LinkedListOfFloat30" table="LINKEDLIST_OF_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfFloat31" column="LINKEDLIST_OF_FLOAT31">
             </field>
@@ -122,7 +146,10 @@
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfInteger33" column="LINKEDLIST_OF_INTEGER33">
+            <field name="LinkedListOfInteger33" table="LINKEDLIST_OF_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfInteger34" column="LINKEDLIST_OF_INTEGER34">
             </field>
@@ -131,7 +158,10 @@
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfLong36" column="LINKEDLIST_OF_LONG36">
+            <field name="LinkedListOfLong36" table="LINKEDLIST_OF_LONG36">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37">
             </field>
@@ -140,7 +170,10 @@
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="LinkedListOfShort39" column="LINKEDLIST_OF_SHORT39">
+            <field name="LinkedListOfShort39" table="LINKEDLIST_OF_SHORT39">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="INDEX"/>
             </field>
             <field name="LinkedListOfShort40" column="LINKEDLIST_OF_SHORT40">
             </field>



Mime
View raw message