db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r233380 [1/2] - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/pc/fieldtypes/ jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/...
Date Thu, 18 Aug 2005 21:13:39 GMT
Author: mcaisse
Date: Thu Aug 18 14:13:19 2005
New Revision: 233380

URL: http://svn.apache.org/viewcvs?rev=233380&view=rev
Log:
 JDO-105; improve mapping of FieldsOfSimpleObject, CollectionCollections; fix problems with SimpleClass schema, orm

Modified:
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
    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/FieldsOfSimpleClass-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/FieldsOfSimpleClass-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/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java Thu Aug 18 14:13:19 2005
@@ -63,6 +63,7 @@
   public Collection CollectionOfShort39;
   public Collection CollectionOfShort40;
   public Collection CollectionOfShort41;
+  public Collection CollectionOfSimpleClass42;
 
   public static final String [] fieldSpecs = { 
   "public Collection CollectionOfObject0",
@@ -106,7 +107,8 @@
   "embedded-element=false public Collection CollectionOfLong38",
   "public Collection CollectionOfShort39",
   "embedded-element=true public Collection CollectionOfShort40",
-  "embedded-element=false public Collection CollectionOfShort41"
+  "embedded-element=false public Collection CollectionOfShort41",
+  "serialized-element=true public Collection CollectionOfSimpleClass42"
   };
   public int getLength()
   {
@@ -200,6 +202,8 @@
         return CollectionOfShort40;
       case(41):
         return CollectionOfShort41;
+      case(42):
+        return CollectionOfSimpleClass42;
       default:
         throw new IndexOutOfBoundsException();
     }
@@ -335,6 +339,9 @@
          break;
       case(41):
         CollectionOfShort41= value;
+         break;
+      case(42):
+        CollectionOfSimpleClass42= value;
          break;
       default:
         throw new IndexOutOfBoundsException();

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo Thu Aug 18 14:13:19 2005
@@ -6,16 +6,17 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.CollectionCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="CollectionOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="CollectionOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="CollectionOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  </collection>
+  <element serialized="true" />
 </field>
 <field name="CollectionOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -26,20 +27,27 @@
 </collection>
 </field>
 <field name="CollectionOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  </collection>
+  <element serialized="true" />
+</field>
+<field name="CollectionOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="CollectionOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="CollectionOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="CollectionOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              embedded-element="false">
+  </collection>
+  <element serialized="true" />
 </field>
 <field name="CollectionOfString9" >
 <collection element-type="java.lang.String">
@@ -49,7 +57,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfString11" >
+<field name="CollectionOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -61,7 +69,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfDate14" >
+<field name="CollectionOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -73,7 +81,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfLocale17" >
+<field name="CollectionOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -85,7 +93,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfBigDecimal20" >
+<field name="CollectionOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -97,7 +105,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfBigInteger23" >
+<field name="CollectionOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -109,7 +117,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfByte26" >
+<field name="CollectionOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -121,7 +129,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfDouble29" >
+<field name="CollectionOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -133,7 +141,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfFloat32" >
+<field name="CollectionOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -145,7 +153,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfInteger35" >
+<field name="CollectionOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -157,7 +165,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfLong38" >
+<field name="CollectionOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -169,7 +177,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfShort41" >
+<field name="CollectionOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo Thu Aug 18 14:13:19 2005
@@ -6,196 +6,388 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfObject$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="Object1"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object2"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object3" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object4" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object5" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object6" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object7" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object10" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object11" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object12" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object13" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object14" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object17"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object18"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object19" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object20" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object21" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object22" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object23" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object29" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object30" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object31" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object32" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object33" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object37"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object38"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object39" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object40" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object41" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object42" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object43" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object46" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object47" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object48" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object49" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object50" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object53"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object54"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object55" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object56" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object57" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object58" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object59" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object65" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object66" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object67" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object68" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object69" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object73"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object74"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object75" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object76" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object77" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object78" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object79" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object82" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object83" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object84" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object85" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object86" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object89"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object90"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object91" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object92" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object93" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object94" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object95" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object101" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object102" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object103" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object104" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object105" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object109"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object110"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object111" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object112" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object113" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object114" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object115" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object118" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object119" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object120" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object121" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object122" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object125"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object126"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object127" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object128" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object129" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object130" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object131" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object137" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object138" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object139" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object140" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object141" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 </class>
 </package>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo Thu Aug 18 14:13:19 2005
@@ -4,16 +4,17 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="datastore">
 <field name="CollectionOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="CollectionOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="CollectionOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  </collection>
+  <element serialized="true" />
 </field>
 <field name="CollectionOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -24,20 +25,27 @@
 </collection>
 </field>
 <field name="CollectionOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  </collection>
+  <element serialized="true" />
+</field>
+<field name="CollectionOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="CollectionOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="CollectionOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="CollectionOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              embedded-element="false">
+  </collection>
+  <element serialized="true" />
 </field>
 <field name="CollectionOfString9" >
 <collection element-type="java.lang.String">
@@ -47,7 +55,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfString11" >
+<field name="CollectionOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -59,7 +67,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfDate14" >
+<field name="CollectionOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -71,7 +79,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfLocale17" >
+<field name="CollectionOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -83,7 +91,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfBigDecimal20" >
+<field name="CollectionOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -95,7 +103,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfBigInteger23" >
+<field name="CollectionOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -107,7 +115,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfByte26" >
+<field name="CollectionOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -119,7 +127,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfDouble29" >
+<field name="CollectionOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -131,7 +139,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfFloat32" >
+<field name="CollectionOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -143,7 +151,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfInteger35" >
+<field name="CollectionOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -155,7 +163,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfLong38" >
+<field name="CollectionOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -167,7 +175,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="CollectionOfShort41" >
+<field name="CollectionOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo Thu Aug 18 14:13:19 2005
@@ -4,196 +4,388 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="datastore">
 <field name="Object1"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object2"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object3" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object4" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object5" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object6" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object7" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object10" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object11" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object12" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object13" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object14" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object17"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object18"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object19" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object20" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object21" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object22" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object23" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object29" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object30" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object31" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object32" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object33" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object37"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object38"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object39" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object40" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object41" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object42" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object43" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object46" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object47" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object48" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object49" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object50" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object53"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object54"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object55" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object56" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object57" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object58" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object59" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object65" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object66" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object67" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object68" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object69" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object73"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object74"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object75" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object76" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object77" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object78" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object79" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object82" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object83" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object84" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object85" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object86" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object89"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object90"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object91" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object92" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object93" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object94" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object95" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object101" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object102" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object103" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object104" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object105" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object109"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object110"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object111" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object112" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object113" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object114" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object115" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object118" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object119" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object120" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object121" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object122" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object125"  serialized="true" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object126"  embedded="false" persistence-modifier="persistent">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object127" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object128" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object129" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object130" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object131" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object137" persistence-modifier="none" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object138" persistence-modifier="persistent" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object139" persistence-modifier="persistent" serialized="true">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object140" persistence-modifier="persistent" embedded="false">
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 <field name="Object141" persistence-modifier="transactional" >
+    <extension vendor-name="jpox" key="implementation-classes" 
+               value="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"/>
 </field>
 </class>
 </package>

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=233380&r1=233379&r2=233380&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 Thu Aug 18 14:13:19 2005
@@ -12,12 +12,18 @@
             <field name="CollectionOfObject1"
                    table="COLLECTION_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
+                <element>
+                  <embedded>
+                    <field name="id" column="ID"/>
+                    <field name="intField" column="INTVAL"/>
+                    <field name="stringField" column="STRINGVAL"/>
+                  </embedded>
+                </element>
             </field>
             <field name="CollectionOfObject2"
                    table="COLLECTION_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
+                <element column="COLLVAL"/>
             </field>
             <field name="CollectionOfSimpleClass3"
                    table="COLLECTION_OF_SIMPLE_CLASS3">
@@ -27,12 +33,21 @@
             <field name="CollectionOfSimpleClass4"
                    table="COLLECTION_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
+                <element>
+                  <embedded>
+                    <field name="id" column="ID"/>
+                    <field name="intField" column="INTVAL"/>
+                    <field name="stringField" column="STRINGVAL"/>
+                  </embedded>
+                </element>
             </field>
             <field name="CollectionOfSimpleClass5"
                    table="COLLECTION_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
+                <element column="COLLVAL"/>
+            </field>
+            <field name="CollectionOfSimpleClass42"
+                   column="COLLECTION_OF_SIMPLE_CLASS42">
             </field>
             <field name="CollectionOfSimpleInterface6"
                    table="COLLECTION_OF_SIMPLE_INTERFACE6">
@@ -42,24 +57,29 @@
             <field name="CollectionOfSimpleInterface7"
                    table="COLLECTION_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
+                <element>
+                  <embedded>
+                    <field name="id" column="ID"/>
+                    <field name="intField" column="INTVAL"/>
+                    <field name="stringField" column="STRINGVAL"/>
+                  </embedded>
+                </element>
             </field>
             <field name="CollectionOfSimpleInterface8"
                    table="COLLECTION_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
+                <element column="COLLVAL"/>
             </field>
             <field name="CollectionOfString9"
                    table="COLLECTION_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfString10"
-                   column="COLLECTION_OF_STRING10"
-                   serialized="true">
-            </field>
             <field name="CollectionOfString11"
-                   table="COLLECTION_OF_STRING11">
+                   column="COLLECTION_OF_STRING11">
+            </field>
+            <field name="CollectionOfString10"
+                   table="COLLECTION_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
@@ -68,12 +88,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfDate13"
-                   column="COLLECTION_OF_DATE13"
-                   serialized="true">
-            </field>
             <field name="CollectionOfDate14"
-                   table="COLLECTION_OF_DATE14">
+                   column="COLLECTION_OF_DATE14">
+            </field>
+            <field name="CollectionOfDate13"
+                   table="COLLECTION_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
@@ -82,12 +101,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfLocale16"
-                   column="COLLECTION_OF_LOCALE16"
-                   serialized="true">
-            </field>
             <field name="CollectionOfLocale17"
-                   table="COLLECTION_OF_LOCALE17">
+                   column="COLLECTION_OF_LOCALE17">
+            </field>
+            <field name="CollectionOfLocale16"
+                   table="COLLECTION_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
@@ -96,12 +114,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal19"
-                   column="COLLECTION_OF_BIG_DECIMAL19"
-                   serialized="true">
-            </field>
             <field name="CollectionOfBigDecimal20"
-                   table="COLLECTION_OF_BIG_DECIMAL20">
+                   column="COLLECTION_OF_BIG_DECIMAL20">
+            </field>
+            <field name="CollectionOfBigDecimal19"
+                   table="COLLECTION_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
@@ -110,12 +127,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfBigInteger22"
-                   column="COLLECTION_OF_BIG_INTEGER22"
-                   serialized="true">
-            </field>
             <field name="CollectionOfBigInteger23"
-                   table="COLLECTION_OF_BIG_INTEGER23">
+                   column="COLLECTION_OF_BIG_INTEGER23">
+            </field>
+            <field name="CollectionOfBigInteger22"
+                   table="COLLECTION_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
@@ -124,12 +140,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfByte25"
-                   column="COLLECTION_OF_BYTE25"
-                   serialized="true">
-            </field>
             <field name="CollectionOfByte26"
-                   table="COLLECTION_OF_BYTE26">
+                   column="COLLECTION_OF_BYTE26">
+            </field>
+            <field name="CollectionOfByte25"
+                   table="COLLECTION_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
@@ -138,12 +153,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfDouble28"
-                   column="COLLECTION_OF_DOUBLE28"
-                   serialized="true">
-            </field>
             <field name="CollectionOfDouble29"
-                   table="COLLECTION_OF_DOUBLE29">
+                   column="COLLECTION_OF_DOUBLE29">
+            </field>
+            <field name="CollectionOfDouble28"
+                   table="COLLECTION_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
@@ -152,12 +166,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfFloat31"
-                   column="COLLECTION_OF_FLOAT31"
-                   serialized="true">
-            </field>
             <field name="CollectionOfFloat32"
-                   table="COLLECTION_OF_FLOAT32">
+                   column="COLLECTION_OF_FLOAT32">
+            </field>
+            <field name="CollectionOfFloat31"
+                   table="COLLECTION_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
@@ -166,12 +179,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfInteger34"
-                   column="COLLECTION_OF_INTEGER34"
-                   serialized="true">
-            </field>
             <field name="CollectionOfInteger35"
-                   table="COLLECTION_OF_INTEGER35">
+                   column="COLLECTION_OF_INTEGER35">
+            </field>
+            <field name="CollectionOfInteger34"
+                   table="COLLECTION_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
@@ -180,12 +192,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfLong37"
-                   column="COLLECTION_OF_LONG37"
-                   serialized="true">
-            </field>
             <field name="CollectionOfLong38"
-                   table="COLLECTION_OF_LONG38">
+                   column="COLLECTION_OF_LONG38">
+            </field>
+            <field name="CollectionOfLong37"
+                   table="COLLECTION_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
@@ -194,12 +205,11 @@
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
             </field>
-            <field name="CollectionOfShort40"
-                   column="COLLECTION_OF_SHORT40"
-                   serialized="true">
-            </field>
             <field name="CollectionOfShort41"
-                   table="COLLECTION_OF_SHORT41">
+                   column="COLLECTION_OF_SHORT41">
+            </field>
+            <field name="CollectionOfShort40"
+                   table="COLLECTION_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm Thu Aug 18 14:13:19 2005
@@ -31,7 +31,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass109" column="SIMPLECLASS109">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID109"/>
+                    <field name="intField" column="INTFIELD109"/>
+                    <field name="stringField" column="STRINGFIELD109"/>
+                </embedded>
             </field>
             <field name="SimpleClass11" column="SIMPLECLASS11">
                 <foreign-key/>
@@ -76,7 +80,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass125" column="SIMPLECLASS125">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID125"/>
+                    <field name="intField" column="INTFIELD125"/>
+                    <field name="stringField" column="STRINGFIELD125"/>
+                </embedded>
             </field>
             <field name="SimpleClass126" column="SIMPLECLASS126">
                 <foreign-key/>
@@ -114,7 +122,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass17" column="SIMPLECLASS17">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID17"/>
+                    <field name="intField" column="INTFIELD17"/>
+                    <field name="stringField" column="STRINGFIELD17"/>
+                </embedded>
             </field>
             <field name="SimpleClass18" column="SIMPLECLASS18">
                 <foreign-key/>
@@ -152,7 +164,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass37" column="SIMPLECLASS37">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID37"/>
+                    <field name="intField" column="INTFIELD37"/>
+                    <field name="stringField" column="STRINGFIELD37"/>
+                </embedded>
             </field>
             <field name="SimpleClass38" column="SIMPLECLASS38">
                 <foreign-key/>
@@ -197,7 +213,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass53" column="SIMPLECLASS53">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID53"/>
+                    <field name="intField" column="INTFIELD53"/>
+                    <field name="stringField" column="STRINGFIELD53"/>
+                </embedded>
             </field>
             <field name="SimpleClass54" column="SIMPLECLASS54">
                 <foreign-key/>
@@ -235,7 +255,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass73" column="SIMPLECLASS73">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID73"/>
+                    <field name="intField" column="INTFIELD73"/>
+                    <field name="stringField" column="STRINGFIELD73"/>
+                </embedded>
             </field>
             <field name="SimpleClass74" column="SIMPLECLASS74">
                 <foreign-key/>
@@ -270,7 +294,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass89" column="SIMPLECLASS89">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID89"/>
+                    <field name="intField" column="INTFIELD89"/>
+                    <field name="stringField" column="STRINGFIELD89"/>
+                </embedded>
             </field>
             <field name="SimpleClass90" column="SIMPLECLASS90">
                 <foreign-key/>

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=233380&r1=233379&r2=233380&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 Thu Aug 18 14:13:19 2005
@@ -5,160 +5,212 @@
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
-            <field name="CollectionOfObject0" table="COLLECTION_OF_OBJECT0">
+            <field name="CollectionOfObject0"
+                   table="COLLECTION_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
             </field>
-            <field name="CollectionOfObject1" table="COLLECTION_OF_OBJECT1">
+            <field name="CollectionOfObject1"
+                   table="COLLECTION_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
+                <element>
+                  <embedded>
+                    <field name="id" column="ID"/>
+                    <field name="intField" column="INTVAL"/>
+                    <field name="stringField" column="STRINGVAL"/>
+                  </embedded>
+                </element>
             </field>
-            <field name="CollectionOfObject2" table="COLLECTION_OF_OBJECT2">
+            <field name="CollectionOfObject2"
+                   table="COLLECTION_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
+                <element column="COLLVAL"/>
             </field>
-            <field name="CollectionOfSimpleClass3" table="COLLECTION_OF_SIMPLE_CLASS3">
+            <field name="CollectionOfSimpleClass3"
+                   table="COLLECTION_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
             </field>
-            <field name="CollectionOfSimpleClass4" table="COLLECTION_OF_SIMPLE_CLASS4">
+            <field name="CollectionOfSimpleClass4"
+                   table="COLLECTION_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-            </field>
-            <field name="CollectionOfSimpleClass5" table="COLLECTION_OF_SIMPLE_CLASS5">
+                <element>
+                  <embedded>
+                    <field name="id" column="ID"/>
+                    <field name="intField" column="INTVAL"/>
+                    <field name="stringField" column="STRINGVAL"/>
+                  </embedded>
+                </element>
+            </field>
+            <field name="CollectionOfSimpleClass5"
+                   table="COLLECTION_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
+                <element column="COLLVAL"/>
+            </field>
+            <field name="CollectionOfSimpleClass42"
+                   column="COLLECTION_OF_SIMPLE_CLASS42">
             </field>
-            <field name="CollectionOfSimpleInterface6" table="COLLECTION_OF_SIMPLE_INTERFACE6">
+            <field name="CollectionOfSimpleInterface6"
+                   table="COLLECTION_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfSimpleInterface7" table="COLLECTION_OF_SIMPLE_INTERFACE7">
+            <field name="CollectionOfSimpleInterface7"
+                   table="COLLECTION_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
+                <element>
+                  <embedded>
+                    <field name="id" column="ID"/>
+                    <field name="intField" column="INTVAL"/>
+                    <field name="stringField" column="STRINGVAL"/>
+                  </embedded>
+                </element>
             </field>
-            <field name="CollectionOfSimpleInterface8" table="COLLECTION_OF_SIMPLE_INTERFACE8">
+            <field name="CollectionOfSimpleInterface8"
+                   table="COLLECTION_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
+                <element column="COLLVAL"/>
             </field>
-            <field name="CollectionOfString9" table="COLLECTION_OF_STRING9">
+            <field name="CollectionOfString9"
+                   table="COLLECTION_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfString10" column="COLLECTION_OF_STRING10"
-                   serialized="true">
+            <field name="CollectionOfString11"
+                   column="COLLECTION_OF_STRING11">
             </field>
-            <field name="CollectionOfString11" table="COLLECTION_OF_STRING11">
+            <field name="CollectionOfString10"
+                   table="COLLECTION_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfDate12" table="COLLECTION_OF_DATE12">
+            <field name="CollectionOfDate12"
+                   table="COLLECTION_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfDate13" column="COLLECTION_OF_DATE13"
-                   serialized="true">
+            <field name="CollectionOfDate14"
+                   column="COLLECTION_OF_DATE14">
             </field>
-            <field name="CollectionOfDate14" table="COLLECTION_OF_DATE14">
+            <field name="CollectionOfDate13"
+                   table="COLLECTION_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfLocale15" table="COLLECTION_OF_LOCALE15">
+            <field name="CollectionOfLocale15"
+                   table="COLLECTION_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfLocale16" column="COLLECTION_OF_LOCALE16"
-                   serialized="true">
+            <field name="CollectionOfLocale17"
+                   column="COLLECTION_OF_LOCALE17">
             </field>
-            <field name="CollectionOfLocale17" table="COLLECTION_OF_LOCALE17">
+            <field name="CollectionOfLocale16"
+                   table="COLLECTION_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal18" table="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"
-                   serialized="true">
+            <field name="CollectionOfBigDecimal20"
+                   column="COLLECTION_OF_BIG_DECIMAL20">
             </field>
-            <field name="CollectionOfBigDecimal20" table="COLLECTION_OF_BIG_DECIMAL20">
+            <field name="CollectionOfBigDecimal19"
+                   table="COLLECTION_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigInteger21" table="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"
-                   serialized="true">
+            <field name="CollectionOfBigInteger23"
+                   column="COLLECTION_OF_BIG_INTEGER23">
             </field>
-            <field name="CollectionOfBigInteger23" table="COLLECTION_OF_BIG_INTEGER23">
+            <field name="CollectionOfBigInteger22"
+                   table="COLLECTION_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfByte24" table="COLLECTION_OF_BYTE24">
+            <field name="CollectionOfByte24"
+                   table="COLLECTION_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfByte25" column="COLLECTION_OF_BYTE25"
-                   serialized="true">
+            <field name="CollectionOfByte26"
+                   column="COLLECTION_OF_BYTE26">
             </field>
-            <field name="CollectionOfByte26" table="COLLECTION_OF_BYTE26">
+            <field name="CollectionOfByte25"
+                   table="COLLECTION_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfDouble27" table="COLLECTION_OF_DOUBLE27">
+            <field name="CollectionOfDouble27"
+                   table="COLLECTION_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfDouble28" column="COLLECTION_OF_DOUBLE28"
-                   serialized="true">
+            <field name="CollectionOfDouble29"
+                   column="COLLECTION_OF_DOUBLE29">
             </field>
-            <field name="CollectionOfDouble29" table="COLLECTION_OF_DOUBLE29">
+            <field name="CollectionOfDouble28"
+                   table="COLLECTION_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfFloat30" table="COLLECTION_OF_FLOAT30">
+            <field name="CollectionOfFloat30"
+                   table="COLLECTION_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfFloat31" column="COLLECTION_OF_FLOAT31"
-                   serialized="true">
+            <field name="CollectionOfFloat32"
+                   column="COLLECTION_OF_FLOAT32">
             </field>
-            <field name="CollectionOfFloat32" table="COLLECTION_OF_FLOAT32">
+            <field name="CollectionOfFloat31"
+                   table="COLLECTION_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfInteger33" table="COLLECTION_OF_INTEGER33">
+            <field name="CollectionOfInteger33"
+                   table="COLLECTION_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34"
-                   serialized="true">
+            <field name="CollectionOfInteger35"
+                   column="COLLECTION_OF_INTEGER35">
             </field>
-            <field name="CollectionOfInteger35" table="COLLECTION_OF_INTEGER35">
+            <field name="CollectionOfInteger34"
+                   table="COLLECTION_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfLong36" table="COLLECTION_OF_LONG36">
+            <field name="CollectionOfLong36"
+                   table="COLLECTION_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfLong37" column="COLLECTION_OF_LONG37"
-                   serialized="true">
+            <field name="CollectionOfLong38"
+                   column="COLLECTION_OF_LONG38">
             </field>
-            <field name="CollectionOfLong38" table="COLLECTION_OF_LONG38">
+            <field name="CollectionOfLong37"
+                   table="COLLECTION_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfShort39" table="COLLECTION_OF_SHORT39">
+            <field name="CollectionOfShort39"
+                   table="COLLECTION_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
             </field>
-            <field name="CollectionOfShort40" column="COLLECTION_OF_SHORT40"
-                   serialized="true">
+            <field name="CollectionOfShort41"
+                   column="COLLECTION_OF_SHORT41">
             </field>
-            <field name="CollectionOfShort41" table="COLLECTION_OF_SHORT41">
+            <field name="CollectionOfShort40"
+                   table="COLLECTION_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
             </field>



Mime
View raw message