db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r351537 - in /incubator/jdo/trunk/tck20/test: jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
Date Fri, 02 Dec 2005 00:22:26 GMT
Author: mcaisse
Date: Thu Dec  1 16:22:21 2005
New Revision: 351537

URL: http://svn.apache.org/viewcvs?rev=351537&view=rev
Log:
JDO-211, JDO-215

Modified:
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo?rev=351537&r1=351536&r2=351537&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo Thu Dec  1 16:22:21 2005
@@ -4,433 +4,432 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="datastore">
 <field name="HashMapOfString_Object0" >
-<map key-type="String" value-type="SimpleClass">
-</map>
+    <map key-type="String" value-type="SimpleClass">
+    </map>
 </field>
 <field name="HashMapOfString_Object1" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true">
-</map>
+    <map key-type="String" value-type="SimpleClass" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Object2" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true" embedded-value="false">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true" embedded-value="false">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleClass3" >
-<map key-type="String" value-type="SimpleClass">
-</map>
+    <map key-type="String" value-type="SimpleClass">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleClass4" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true">
-</map>
+    <map key-type="String" value-type="SimpleClass" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleClass5" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true" embedded-value="false">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true" embedded-value="false">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleInterface6" >
-<map key-type="String" value-type="SimpleClass">
-</map>
+    <map key-type="String" value-type="SimpleClass">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleInterface7" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleInterface8" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true" embedded-value="false">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true" embedded-value="false">
+    </map>
 </field>
 <field name="HashMapOfString_String9" >
-<map key-type="String" value-type="String"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="String"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_String10" >
-<map key-type="String" value-type="String" embedded-value="true">
-</map>
+    <map key-type="String" value-type="String" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_String11" >
-<map key-type="String" value-type="String">
-</map>
+    <map key-type="String" value-type="String">
+    </map>
 </field>
 <field name="HashMapOfString_Date12" >
-<map key-type="String" value-type="java.util.Date"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.util.Date"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Date13" >
-<map key-type="String" value-type="java.util.Date" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.util.Date" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Date14" >
-<map key-type="String" value-type="java.util.Date">
-</map>
+    <map key-type="String" value-type="java.util.Date">
+    </map>
 </field>
 <field name="HashMapOfString_Locale15" >
-<map key-type="String" value-type="java.util.Locale"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.util.Locale"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Locale16" >
-<map key-type="String" value-type="java.util.Locale" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.util.Locale" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Locale17" >
-<map key-type="String" value-type="java.util.Locale">
-</map>
+    <map key-type="String" value-type="java.util.Locale">
+    </map>
 </field>
 <field name="HashMapOfString_BigDecimal18" >
-<map key-type="String" value-type="java.math.BigDecimal"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.math.BigDecimal"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigDecimal19" >
-<map key-type="String" value-type="java.math.BigDecimal" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.math.BigDecimal" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigDecimal20" >
-<map key-type="String" value-type="java.math.BigDecimal">
-</map>
+    <map key-type="String" value-type="java.math.BigDecimal">
+    </map>
 </field>
 <field name="HashMapOfString_BigInteger21" >
-<map key-type="String" value-type="java.math.BigInteger"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.math.BigInteger"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigInteger22" >
-<map key-type="String" value-type="java.math.BigInteger" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.math.BigInteger" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigInteger23" >
-<map key-type="String" value-type="java.math.BigInteger">
-</map>
+    <map key-type="String" value-type="java.math.BigInteger">
+    </map>
 </field>
 <field name="HashMapOfString_Byte24" >
-<map key-type="String" value-type="Byte"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Byte"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Byte25" >
-<map key-type="String" value-type="Byte" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Byte" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Byte26" >
-<map key-type="String" value-type="Byte">
-</map>
+    <map key-type="String" value-type="Byte">
+    </map>
 </field>
 <field name="HashMapOfString_Double27" >
-<map key-type="String" value-type="Double"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Double"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Double28" >
-<map key-type="String" value-type="Double" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Double" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Double29" >
-<map key-type="String" value-type="Double">
-</map>
+    <map key-type="String" value-type="Double">
+    </map>
 </field>
 <field name="HashMapOfString_Float30" >
-<map key-type="String" value-type="Float"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Float"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Float31" >
-<map key-type="String" value-type="Float" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Float" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Float32" >
-<map key-type="String" value-type="Float">
-</map>
+    <map key-type="String" value-type="Float">
+    </map>
 </field>
 <field name="HashMapOfString_Integer33" >
-<map key-type="String" value-type="Integer"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Integer"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Integer34" >
-<map key-type="String" value-type="Integer" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Integer" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Integer35" >
-<map key-type="String" value-type="Integer">
-</map>
+    <map key-type="String" value-type="Integer">
+    </map>
 </field>
 <field name="HashMapOfString_Long36" >
-<map key-type="String" value-type="Long"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Long"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Long37" >
-<map key-type="String" value-type="Long" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Long" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Long38" >
-<map key-type="String" value-type="Long">
-</map>
+    <map key-type="String" value-type="Long">
+    </map>
 </field>
 <field name="HashMapOfString_Short39" >
-<map key-type="String" value-type="Short"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Short"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Short40" >
-<map key-type="String" value-type="Short" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Short" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Short41" >
-<map key-type="String" value-type="Short">
-</map>
+    <map key-type="String" value-type="Short">
+    </map>
 </field>
 <field name="HashMapOfString_Object42" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Object43">
-<map key-type="String" value-type="SimpleClass"
+    <map key-type="String" value-type="SimpleClass"
    embedded-value="true">
-</map>
+    </map>
 </field>
 <field name="HashMapOfString_SimpleClass45" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleClass46" >
-<map key-type="String" value-type="SimpleClass"
+    <map key-type="String" value-type="SimpleClass"
    embedded-value="true">
-</map>
+    </map>
 </field>
 <field name="HashMapOfString_SimpleInterface48" >
-<map key-type="String" value-type="SimpleClass"
-   embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="SimpleClass"
+        embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleInterface49" >
-<map key-type="String" value-type="SimpleClass"
+    <map key-type="String" value-type="SimpleClass"
    embedded-value="true">
-</map>
+    </map>
 </field>
 <field name="HashMapOfString_String51" >
-<map key-type="String" value-type="String"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="String"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_String52" >
-<map key-type="String" value-type="String" embedded-key="true">
-</map>
+    <map key-type="String" value-type="String" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Date54" >
-<map key-type="String" value-type="java.util.Date"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.util.Date"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Date55" >
-<map key-type="String" value-type="java.util.Date" embedded-key="true">
-</map>
+    <map key-type="String" value-type="java.util.Date" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Locale57" >
-<map key-type="String" value-type="java.util.Locale"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.util.Locale"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Locale58" >
-<map key-type="String" value-type="java.util.Locale" embedded-key="true">
-</map>
+    <map key-type="String" value-type="java.util.Locale" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigDecimal60" >
-<map key-type="String" value-type="java.math.BigDecimal"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.math.BigDecimal"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigDecimal61" >
-<map key-type="String" value-type="java.math.BigDecimal" embedded-key="true">
-</map>
+    <map key-type="String" value-type="java.math.BigDecimal"
+         embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigInteger63" >
-<map key-type="String" value-type="java.math.BigInteger"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="java.math.BigInteger"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_BigInteger64" >
-<map key-type="String" value-type="java.math.BigInteger" embedded-key="true">
-</map>
+    <map key-type="String" value-type="java.math.BigInteger" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Byte66" >
-<map key-type="String" value-type="Byte"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Byte"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Byte67" >
-<map key-type="String" value-type="Byte" embedded-key="true">
-</map>
+    <map key-type="String" value-type="Byte" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Double69" >
-<map key-type="String" value-type="Double"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Double"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Double70" >
-<map key-type="String" value-type="Double" embedded-key="true">
-</map>
+    <map key-type="String" value-type="Double" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Float72" >
-<map key-type="String" value-type="Float"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Float"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Float73" >
-<map key-type="String" value-type="Float" embedded-key="true">
-</map>
+    <map key-type="String" value-type="Float" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Integer75" >
-<map key-type="String" value-type="Integer"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Integer"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Integer76" >
-<map key-type="String" value-type="Integer" embedded-key="true">
-</map>
+    <map key-type="String" value-type="Integer" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Long78" >
-<map key-type="String" value-type="Long"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Long"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Long79" >
-<map key-type="String" value-type="Long" embedded-key="true">
-</map>
+    <map key-type="String" value-type="Long" embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Short81" >
-<map key-type="String" value-type="Short"
-     embedded-key="true" embedded-value="true">
-</map>
+    <map key-type="String" value-type="Short"
+            embedded-key="true" embedded-value="true">
+    </map>
 </field>
 <field name="HashMapOfString_Short82" >
-<map key-type="String" value-type="Short" embedded-key="true">
-</map>
+    <map key-type="String" value-type="Short" embedded-key="true">
+    </map>
 </field>
-<field name="HashMapOfString_Object84">
-<map key-type="String" value-type="SimpleClass"
-     embedded-key="true" serialized-value="true">
-</map>
+<field name="HashMapOfString_Object84" serialized="true">
+    <map key-type="String" value-type="SimpleClass"
+            embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_Object86" serialized="true">
-<map key-type="String" value-type="SimpleClass">
-</map>
+    <map key-type="String" value-type="SimpleClass">
+    </map>
 </field>
-<field name="HashMapOfString_SimpleClass87">
-<map key-type="String" value-type="SimpleClass"
-     embedded-key="true" serialized-value="true">
-</map>
+<field name="HashMapOfString_SimpleClass87" serialized="true">
+    <map key-type="String" value-type="SimpleClass"
+    embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleClass89" serialized="true">
-<map key-type="String" value-type="SimpleClass">
-</map>
+    <map key-type="String" value-type="SimpleClass">
+    </map>
 </field>
-<field name="HashMapOfString_SimpleInterface90">
-<map key-type="String" value-type="SimpleClass"
-     embedded-key="true" serialized-value="true">
-</map>
+<field name="HashMapOfString_SimpleInterface90" serialized="true">
+    <map key-type="String" value-type="SimpleClass"
+            embedded-key="true">
+    </map>
 </field>
 <field name="HashMapOfString_SimpleInterface92" serialized="true">
-<map key-type="String" value-type="SimpleClass">
-</map>
+    <map key-type="String" value-type="SimpleClass">
+    </map>
 </field>
 <field name="HashMapOfString_String93" >
-<map key-type="String" value-type="String">
-</map>
+    <map key-type="String" value-type="String">
+    </map>
 </field>
 <field name="HashMapOfString_String95" serialized="true">
-<map key-type="String" value-type="String">
-</map>
+    <map key-type="String" value-type="String">
+    </map>
 </field>
 <field name="HashMapOfString_Date96" >
-<map key-type="String" value-type="java.util.Date">
-</map>
+    <map key-type="String" value-type="java.util.Date">
+    </map>
 </field>
-<field name="HashMapOfString_Date98" >
-<map key-type="String" value-type="java.util.Date" serialized="true">
-</map>
+<field name="HashMapOfString_Date98" serialized="true">
+    <map key-type="String" value-type="java.util.Date">
+    </map>
 </field>
 <field name="HashMapOfString_Locale99" >
-<map key-type="String" value-type="java.util.Locale">
-</map>
+    <map key-type="String" value-type="java.util.Locale">
+    </map>
 </field>
-<field name="HashMapOfString_Locale101" >
-<map key-type="String" value-type="java.util.Locale" serialized="true">
-</map>
+<field name="HashMapOfString_Locale101" serialized="true">
+    <map key-type="String" value-type="java.util.Locale">
+    </map>
 </field>
 <field name="HashMapOfString_BigDecimal102" >
-<map key-type="String" value-type="java.math.BigDecimal">
-</map>
+    <map key-type="String" value-type="java.math.BigDecimal">
+    </map>
 </field>
-<field name="HashMapOfString_BigDecimal104" >
-<map key-type="String" value-type="java.math.BigDecimal" serialized="true">
-</map>
+<field name="HashMapOfString_BigDecimal104" serialized="true">
+    <map key-type="String" value-type="java.math.BigDecimal">
+    </map>
 </field>
 <field name="HashMapOfString_BigInteger105" >
-<map key-type="String" value-type="java.math.BigInteger">
-</map>
+    <map key-type="String" value-type="java.math.BigInteger">
+    </map>
 </field>
-<field name="HashMapOfString_BigInteger107" >
-<map key-type="String" value-type="java.math.BigInteger" serialized="true">
-</map>
+<field name="HashMapOfString_BigInteger107" serialized="true">
+    <map key-type="String" value-type="java.math.BigInteger">
+    </map>
 </field>
 <field name="HashMapOfString_Byte108" >
-<map key-type="String" value-type="Byte">
-</map>
+    <map key-type="String" value-type="Byte">
+    </map>
 </field>
-<field name="HashMapOfString_Byte110" >
-<map key-type="String" value-type="Byte" serialized="true">
-</map>
+<field name="HashMapOfString_Byte110" serialized="true">
+    <map key-type="String" value-type="Byte">
+    </map>
 </field>
 <field name="HashMapOfString_Double111" >
-<map key-type="String" value-type="Double">
-</map>
+    <map key-type="String" value-type="Double">
+    </map>
 </field>
-<field name="HashMapOfString_Double113" >
-<map key-type="String" value-type="Double" serialized="true">
-</map>
+<field name="HashMapOfString_Double113" serialized="true">
+    <map key-type="String" value-type="Double">
+    </map>
 </field>
 <field name="HashMapOfString_Float114" >
-<map key-type="String" value-type="Float">
-</map>
+    <map key-type="String" value-type="Float">
+    </map>
 </field>
-<field name="HashMapOfString_Float116" >
-<map key-type="String" value-type="Float" serialized="true">
-</map>
+<field name="HashMapOfString_Float116" serialized="true">
+    <map key-type="String" value-type="Float">
+    </map>
 </field>
 <field name="HashMapOfString_Integer117" >
-<map key-type="String" value-type="Integer">
-</map>
+    <map key-type="String" value-type="Integer">
+    </map>
 </field>
-<field name="HashMapOfString_Integer119" >
-<map key-type="String" value-type="Integer" serialized="true">
-</map>
+<field name="HashMapOfString_Integer119" serialized="true">
+    <map key-type="String" value-type="Integer">
+    </map>
 </field>
 <field name="HashMapOfString_Long120" >
-<map key-type="String" value-type="Long">
-</map>
+    <map key-type="String" value-type="Long">
+    </map>
 </field>
-<field name="HashMapOfString_Long122" >
-<map key-type="String" value-type="Long" serialized="true">
-</map>
+<field name="HashMapOfString_Long122" serialized="true">
+    <map key-type="String" value-type="Long">
+    </map>
 </field>
 <field name="HashMapOfString_Short123" >
-<map key-type="String" value-type="Short">
-</map>
+    <map key-type="String" value-type="Short">
+    </map>
 </field>
-<field name="HashMapOfString_Short125" >
-<map key-type="String" value-type="Short" serialized="true">
-</map>
+<field name="HashMapOfString_Short125" serialized="true">
+    <map key-type="String" value-type="Short">
+    </map>
 </field>
 </class>
 </package>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=351537&r1=351536&r2=351537&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Thu Dec  1 16:22:21 2005
@@ -23,10 +23,15 @@
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -34,10 +39,15 @@
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -45,10 +55,15 @@
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -77,10 +92,15 @@
             </field>
             <field name="HashMapOfSimpleClass_String12"
                    table="HASHMAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -89,10 +109,15 @@
             </field>
             <field name="HashMapOfSimpleClass_String13"
                    table="HASHMAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -101,10 +126,15 @@
             </field>
             <field name="HashMapOfSimpleClass_String15"
                    table="HASHMAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -134,10 +164,15 @@
             </field>
             <field name="HashMapOfSimpleInterface_String21"
                    table="HASHMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -146,10 +181,15 @@
             </field>
             <field name="HashMapOfSimpleInterface_String22"
                    table="HASHMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -158,10 +198,15 @@
             </field>
             <field name="HashMapOfSimpleInterface_String24"
                    table="HASHMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -409,37 +454,44 @@
             </field>
             <field name="HashMapOfFloat_String89" column="HASHMAP_FLOAT89_STR">
             </field>
-            <field name="HashMapOfInteger_String90" table="HASHMAP_INTEGER90_STR">
+            <field name="HashMapOfInteger_String90"
+                   table="HASHMAP_INTEGER90_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfInteger_String91" table="HASHMAP_INTEGER91_STR">
+            <field name="HashMapOfInteger_String91"
+                   table="HASHMAP_INTEGER91_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfInteger_String92" table="HASHMAP_INTEGER92_STR">
+            <field name="HashMapOfInteger_String92"
+                   table="HASHMAP_INTEGER92_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfInteger_String93" table="HASHMAP_INTEGER93_STR">
+            <field name="HashMapOfInteger_String93"
+                   table="HASHMAP_INTEGER93_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfInteger_String94" table="HASHMAP_INTEGER94_STR">
+            <field name="HashMapOfInteger_String94"
+                   table="HASHMAP_INTEGER94_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfInteger_String96" table="HASHMAP_INTEGER96_STR">
+            <field name="HashMapOfInteger_String96"
+                   table="HASHMAP_INTEGER96_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfInteger_String98" column="HASHMAP_INTEGER98_STR">
+            <field name="HashMapOfInteger_String98"
+                   column="HASHMAP_INTEGER98_STR">
             </field>
             <field name="HashMapOfLong_String99" table="HASHMAP_LONG99_STR">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=351537&r1=351536&r2=351537&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Thu Dec  1 16:22:21 2005
@@ -27,10 +27,15 @@
             </field>
             <field name="HashtableOfObject_String3"
                    table="HASHTBL_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -39,10 +44,15 @@
             </field>
             <field name="HashtableOfObject_String4"
                    table="HASHTBL_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -51,10 +61,15 @@
             </field>
             <field name="HashtableOfObject_String6"
                    table="HASHTBL_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -84,10 +99,15 @@
             </field>
             <field name="HashtableOfSimpleClass_String12"
                    table="HASHTBL_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -96,10 +116,15 @@
             </field>
             <field name="HashtableOfSimpleClass_String13"
                    table="HASHTBL_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -108,10 +133,15 @@
             </field>
             <field name="HashtableOfSimpleClass_String15"
                    table="HASHTBL_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -141,10 +171,15 @@
             </field>
             <field name="HashtableOfSimpleInterface_String21"
                    table="HASHTBL_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -153,10 +188,15 @@
             </field>
             <field name="HashtableOfSimpleInterface_String22"
                    table="HASHTBL_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -165,10 +205,15 @@
             </field>
             <field name="HashtableOfSimpleInterface_String24"
                    table="HASHTBL_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=351537&r1=351536&r2=351537&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Thu Dec  1 16:22:21 2005
@@ -23,10 +23,15 @@
                 <value column="VALUEVAL"/>
             </field>
             <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -34,21 +39,30 @@
                 <value column="VALUEVAL"/>
             </field>
             <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -77,10 +91,15 @@
             </field>
             <field name="MapOfSimpleClass_String12"
                    table="MAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -89,10 +108,15 @@
             </field>
             <field name="MapOfSimpleClass_String13"
                    table="MAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -101,10 +125,15 @@
             </field>
             <field name="MapOfSimpleClass_String15"
                    table="MAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -134,10 +163,15 @@
             </field>
             <field name="MapOfSimpleInterface_String21"
                    table="MAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -146,10 +180,15 @@
             </field>
             <field name="MapOfSimpleInterface_String22"
                    table="MAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -158,10 +197,15 @@
             </field>
             <field name="MapOfSimpleInterface_String24"
                    table="MAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=351537&r1=351536&r2=351537&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Thu Dec  1 16:22:21 2005
@@ -24,10 +24,15 @@
             </field>
             <field name="TreeMapOfObject_String3"
                    table="TREEMAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -36,10 +41,15 @@
             </field>
             <field name="TreeMapOfObject_String4"
                    table="TREEMAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -48,10 +58,15 @@
             </field>
             <field name="TreeMapOfObject_String6"
                    table="TREEMAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -81,10 +96,15 @@
             </field>
             <field name="TreeMapOfSimpleClass_String12"
                    table="TREEMAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -93,10 +113,15 @@
             </field>
             <field name="TreeMapOfSimpleClass_String13"
                    table="TREEMAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -105,10 +130,15 @@
             </field>
             <field name="TreeMapOfSimpleClass_String15"
                    table="TREEMAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -138,10 +168,15 @@
             </field>
             <field name="TreeMapOfSimpleInterface_String21"
                    table="TREEMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -150,10 +185,15 @@
             </field>
             <field name="TreeMapOfSimpleInterface_String22"
                    table="TREEMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -162,10 +202,15 @@
             </field>
             <field name="TreeMapOfSimpleInterface_String24"
                    table="TREEMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <key>
                     <embedded>
-                        <field name="id" primary-key="true" column="ID"/>
+                        <field name="id" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>



Mime
View raw message