db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r326257 [1/3] - in /incubator/jdo/trunk/tck20/test: jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreide...
Date Tue, 18 Oct 2005 21:38:00 GMT
Author: mcaisse
Date: Tue Oct 18 14:37:54 2005
New Revision: 326257

URL: http://svn.apache.org/viewcvs?rev=326257&view=rev
Log:
JDO-122 (partial)

Modified:
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-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/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo?rev=326257&r1=326256&r2=326257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo Tue Oct 18 14:37:54 2005
@@ -3,398 +3,435 @@
 <jdo>
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="application"
-    objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashMapStringKeyCollections$Oid">
+  objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashMapStringKeyCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="HashMapOfString_Object0" >
-<map  key-type="String" value-type="Object">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_Object1" >
-<map  key-type="String" value-type="Object" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Object2" >
-<map  key-type="String" value-type="Object" embedded-value="false">
+<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 key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass4" >
-<map  key-type="String" value-type="SimpleClass" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass5" >
-<map  key-type="String" value-type="SimpleClass" embedded-value="false">
+<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="SimpleInterface">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface7" >
-<map  key-type="String" value-type="SimpleInterface" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface8" >
-<map  key-type="String" value-type="SimpleInterface" embedded-value="false">
+<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">
+<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 key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String11" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashMapOfString_Date12" >
-<map  key-type="String" value-type="java.util.Date">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.util.Date">
 </map>
 </field>
 <field name="HashMapOfString_Locale15" >
-<map  key-type="String" value-type="java.util.Locale">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.util.Locale">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal18" >
-<map  key-type="String" value-type="java.math.BigDecimal">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.math.BigDecimal">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger21" >
-<map  key-type="String" value-type="java.math.BigInteger">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.math.BigInteger">
 </map>
 </field>
 <field name="HashMapOfString_Byte24" >
-<map  key-type="String" value-type="Byte">
+<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 key-type="String" value-type="Byte" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte26" >
-<map  key-type="String" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="HashMapOfString_Double27" >
-<map  key-type="String" value-type="Double">
+<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 key-type="String" value-type="Double" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Double29" >
-<map  key-type="String" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="HashMapOfString_Float30" >
-<map  key-type="String" value-type="Float">
+<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 key-type="String" value-type="Float" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Float32" >
-<map  key-type="String" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="HashMapOfString_Integer33" >
-<map  key-type="String" value-type="Integer">
+<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 key-type="String" value-type="Integer" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer35" >
-<map  key-type="String" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="HashMapOfString_Long36" >
-<map  key-type="String" value-type="Long">
+<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 key-type="String" value-type="Long" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Long38" >
-<map  key-type="String" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="HashMapOfString_Short39" >
-<map  key-type="String" value-type="Short">
+<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 key-type="String" value-type="Short" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Short41" >
-<map  key-type="String" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="HashMapOfString_Object42" >
-<map  key-type="String" embedded-key="true" value-type="Object">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Object43" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
+<field name="HashMapOfString_Object43">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass45" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass46" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface48" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface">
+<map key-type="String" value-type="SimpleInterface"
+   embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface49" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="true">
+<map key-type="String" value-type="SimpleInterface"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String51" >
-<map  key-type="String" embedded-key="true" value-type="String">
+<map key-type="String" value-type="String"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String52" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
+<map key-type="String" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Date54" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Date">
+<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" embedded-key="true" value-type="java.util.Date" embedded-value="true">
+<map key-type="String" value-type="java.util.Date" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Locale57" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Locale">
+<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" embedded-key="true" value-type="java.util.Locale" embedded-value="true">
+<map key-type="String" value-type="java.util.Locale" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal60" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal">
+<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" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="true">
+<map key-type="String" value-type="java.math.BigDecimal" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger63" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigInteger">
+<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" embedded-key="true" value-type="java.math.BigInteger" embedded-value="true">
+<map key-type="String" value-type="java.math.BigInteger" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte66" >
-<map  key-type="String" embedded-key="true" value-type="Byte">
+<map key-type="String" value-type="Byte"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte67" >
-<map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="true">
+<map key-type="String" value-type="Byte" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Double69" >
-<map  key-type="String" embedded-key="true" value-type="Double">
+<map key-type="String" value-type="Double"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Double70" >
-<map  key-type="String" embedded-key="true" value-type="Double" embedded-value="true">
+<map key-type="String" value-type="Double" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Float72" >
-<map  key-type="String" embedded-key="true" value-type="Float">
+<map key-type="String" value-type="Float"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Float73" >
-<map  key-type="String" embedded-key="true" value-type="Float" embedded-value="true">
+<map key-type="String" value-type="Float" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer75" >
-<map  key-type="String" embedded-key="true" value-type="Integer">
+<map key-type="String" value-type="Integer"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer76" >
-<map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="true">
+<map key-type="String" value-type="Integer" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Long78" >
-<map  key-type="String" embedded-key="true" value-type="Long">
+<map key-type="String" value-type="Long"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Long79" >
-<map  key-type="String" embedded-key="true" value-type="Long" embedded-value="true">
+<map key-type="String" value-type="Long" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Short81" >
-<map  key-type="String" embedded-key="true" value-type="Short">
+<map key-type="String" value-type="Short"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Short82" >
-<map  key-type="String" embedded-key="true" value-type="Short" embedded-value="true">
+<map key-type="String" value-type="Short" embedded-key="true">
 </map>
 </field>
-<field name="HashMapOfString_Object84" >
-<map  key-type="String" embedded-key="false" value-type="Object">
+<field name="HashMapOfString_Object84">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Object86" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
+<field name="HashMapOfString_Object86" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashMapOfString_SimpleClass87" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass">
+<field name="HashMapOfString_SimpleClass87">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashMapOfString_SimpleClass89" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
+<field name="HashMapOfString_SimpleClass89" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashMapOfString_SimpleInterface90" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface">
+<field name="HashMapOfString_SimpleInterface90">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashMapOfString_SimpleInterface92" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
+<field name="HashMapOfString_SimpleInterface92" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_String93" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map key-type="String" value-type="String">
 </map>
 </field>
-<field name="HashMapOfString_String95" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfString_String95" serialized="true">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashMapOfString_Date96" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date">
+<map key-type="String" value-type="java.util.Date">
 </map>
 </field>
 <field name="HashMapOfString_Date98" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
+<map key-type="String" value-type="java.util.Date" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Locale99" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale">
+<map key-type="String" value-type="java.util.Locale">
 </map>
 </field>
 <field name="HashMapOfString_Locale101" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
+<map key-type="String" value-type="java.util.Locale" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal102" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal">
+<map key-type="String" value-type="java.math.BigDecimal">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal104" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
+<map key-type="String" value-type="java.math.BigDecimal" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger105" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger">
+<map key-type="String" value-type="java.math.BigInteger">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger107" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
+<map key-type="String" value-type="java.math.BigInteger" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte108" >
-<map  key-type="String" embedded-key="false" value-type="Byte">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="HashMapOfString_Byte110" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Double111" >
-<map  key-type="String" embedded-key="false" value-type="Double">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="HashMapOfString_Double113" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Float114" >
-<map  key-type="String" embedded-key="false" value-type="Float">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="HashMapOfString_Float116" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer117" >
-<map  key-type="String" embedded-key="false" value-type="Integer">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="HashMapOfString_Integer119" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Long120" >
-<map  key-type="String" embedded-key="false" value-type="Long">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="HashMapOfString_Long122" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Short123" >
-<map  key-type="String" embedded-key="false" value-type="Short">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="HashMapOfString_Short125" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short" serialized="true">
 </map>
 </field>
 </class>

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=326257&r1=326256&r2=326257&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 Tue Oct 18 14:37:54 2005
@@ -4,395 +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="Object">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_Object1" >
-<map  key-type="String" value-type="Object" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Object2" >
-<map  key-type="String" value-type="Object" embedded-value="false">
+<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 key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass4" >
-<map  key-type="String" value-type="SimpleClass" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass5" >
-<map  key-type="String" value-type="SimpleClass" embedded-value="false">
+<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="SimpleInterface">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface7" >
-<map  key-type="String" value-type="SimpleInterface" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface8" >
-<map  key-type="String" value-type="SimpleInterface" embedded-value="false">
+<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">
+<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 key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String11" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashMapOfString_Date12" >
-<map  key-type="String" value-type="java.util.Date">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.util.Date">
 </map>
 </field>
 <field name="HashMapOfString_Locale15" >
-<map  key-type="String" value-type="java.util.Locale">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.util.Locale">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal18" >
-<map  key-type="String" value-type="java.math.BigDecimal">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.math.BigDecimal">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger21" >
-<map  key-type="String" value-type="java.math.BigInteger">
+<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 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" embedded-value="false">
+<map key-type="String" value-type="java.math.BigInteger">
 </map>
 </field>
 <field name="HashMapOfString_Byte24" >
-<map  key-type="String" value-type="Byte">
+<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 key-type="String" value-type="Byte" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte26" >
-<map  key-type="String" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="HashMapOfString_Double27" >
-<map  key-type="String" value-type="Double">
+<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 key-type="String" value-type="Double" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Double29" >
-<map  key-type="String" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="HashMapOfString_Float30" >
-<map  key-type="String" value-type="Float">
+<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 key-type="String" value-type="Float" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Float32" >
-<map  key-type="String" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="HashMapOfString_Integer33" >
-<map  key-type="String" value-type="Integer">
+<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 key-type="String" value-type="Integer" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer35" >
-<map  key-type="String" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="HashMapOfString_Long36" >
-<map  key-type="String" value-type="Long">
+<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 key-type="String" value-type="Long" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Long38" >
-<map  key-type="String" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="HashMapOfString_Short39" >
-<map  key-type="String" value-type="Short">
+<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 key-type="String" value-type="Short" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Short41" >
-<map  key-type="String" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="HashMapOfString_Object42" >
-<map  key-type="String" embedded-key="true" value-type="Object">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Object43" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
+<field name="HashMapOfString_Object43">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass45" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass">
+<map key-type="String" value-type="SimpleClass"
+   embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleClass46" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="true">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface48" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface">
+<map key-type="String" value-type="SimpleInterface"
+   embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_SimpleInterface49" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="true">
+<map key-type="String" value-type="SimpleInterface"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String51" >
-<map  key-type="String" embedded-key="true" value-type="String">
+<map key-type="String" value-type="String"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String52" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
+<map key-type="String" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Date54" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Date">
+<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" embedded-key="true" value-type="java.util.Date" embedded-value="true">
+<map key-type="String" value-type="java.util.Date" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Locale57" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Locale">
+<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" embedded-key="true" value-type="java.util.Locale" embedded-value="true">
+<map key-type="String" value-type="java.util.Locale" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal60" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal">
+<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" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="true">
+<map key-type="String" value-type="java.math.BigDecimal" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger63" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigInteger">
+<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" embedded-key="true" value-type="java.math.BigInteger" embedded-value="true">
+<map key-type="String" value-type="java.math.BigInteger" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte66" >
-<map  key-type="String" embedded-key="true" value-type="Byte">
+<map key-type="String" value-type="Byte"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte67" >
-<map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="true">
+<map key-type="String" value-type="Byte" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Double69" >
-<map  key-type="String" embedded-key="true" value-type="Double">
+<map key-type="String" value-type="Double"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Double70" >
-<map  key-type="String" embedded-key="true" value-type="Double" embedded-value="true">
+<map key-type="String" value-type="Double" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Float72" >
-<map  key-type="String" embedded-key="true" value-type="Float">
+<map key-type="String" value-type="Float"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Float73" >
-<map  key-type="String" embedded-key="true" value-type="Float" embedded-value="true">
+<map key-type="String" value-type="Float" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer75" >
-<map  key-type="String" embedded-key="true" value-type="Integer">
+<map key-type="String" value-type="Integer"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer76" >
-<map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="true">
+<map key-type="String" value-type="Integer" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Long78" >
-<map  key-type="String" embedded-key="true" value-type="Long">
+<map key-type="String" value-type="Long"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Long79" >
-<map  key-type="String" embedded-key="true" value-type="Long" embedded-value="true">
+<map key-type="String" value-type="Long" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfString_Short81" >
-<map  key-type="String" embedded-key="true" value-type="Short">
+<map key-type="String" value-type="Short"
+     embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Short82" >
-<map  key-type="String" embedded-key="true" value-type="Short" embedded-value="true">
+<map key-type="String" value-type="Short" embedded-key="true">
 </map>
 </field>
-<field name="HashMapOfString_Object84" >
-<map  key-type="String" embedded-key="false" value-type="Object">
+<field name="HashMapOfString_Object84">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Object86" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
+<field name="HashMapOfString_Object86" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashMapOfString_SimpleClass87" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass">
+<field name="HashMapOfString_SimpleClass87">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashMapOfString_SimpleClass89" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
+<field name="HashMapOfString_SimpleClass89" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashMapOfString_SimpleInterface90" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface">
+<field name="HashMapOfString_SimpleInterface90">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashMapOfString_SimpleInterface92" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
+<field name="HashMapOfString_SimpleInterface92" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashMapOfString_String93" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map key-type="String" value-type="String">
 </map>
 </field>
-<field name="HashMapOfString_String95" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfString_String95" serialized="true">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashMapOfString_Date96" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date">
+<map key-type="String" value-type="java.util.Date">
 </map>
 </field>
 <field name="HashMapOfString_Date98" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
+<map key-type="String" value-type="java.util.Date" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Locale99" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale">
+<map key-type="String" value-type="java.util.Locale">
 </map>
 </field>
 <field name="HashMapOfString_Locale101" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
+<map key-type="String" value-type="java.util.Locale" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal102" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal">
+<map key-type="String" value-type="java.math.BigDecimal">
 </map>
 </field>
 <field name="HashMapOfString_BigDecimal104" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
+<map key-type="String" value-type="java.math.BigDecimal" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger105" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger">
+<map key-type="String" value-type="java.math.BigInteger">
 </map>
 </field>
 <field name="HashMapOfString_BigInteger107" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
+<map key-type="String" value-type="java.math.BigInteger" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Byte108" >
-<map  key-type="String" embedded-key="false" value-type="Byte">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="HashMapOfString_Byte110" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Double111" >
-<map  key-type="String" embedded-key="false" value-type="Double">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="HashMapOfString_Double113" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Float114" >
-<map  key-type="String" embedded-key="false" value-type="Float">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="HashMapOfString_Float116" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Integer117" >
-<map  key-type="String" embedded-key="false" value-type="Integer">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="HashMapOfString_Integer119" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Long120" >
-<map  key-type="String" embedded-key="false" value-type="Long">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="HashMapOfString_Long122" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long" serialized="true">
 </map>
 </field>
 <field name="HashMapOfString_Short123" >
-<map  key-type="String" embedded-key="false" value-type="Short">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="HashMapOfString_Short125" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short" serialized="true">
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=326257&r1=326256&r2=326257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm Tue Oct 18 14:37:54 2005
@@ -2,7 +2,8 @@
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringKeyCollections" table="HASHMAPSTRINGKEY_COLLECTIONS">
+        <class name="HashMapStringKeyCollections"
+               table="HASHMAPSTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
@@ -19,17 +20,20 @@
                 <key column="KEYVAL"/>
                 <value column="OBJREF"/>
             </field>
-            <field name="HashMapOfString_SimpleClass3" table="HASHMAP_STR_SIMPLE_CLASS3">
+            <field name="HashMapOfString_SimpleClass3"
+                   table="HASHMAP_STR_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
             </field>
-            <field name="HashMapOfString_SimpleClass4" table="HASHMAP_STR_SIMPLE_CLASS4">
+            <field name="HashMapOfString_SimpleClass4"
+                   table="HASHMAP_STR_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
             </field>
-            <field name="HashMapOfString_SimpleClass5" table="HASHMAP_STR_SIMPLE_CLASS5">
+            <field name="HashMapOfString_SimpleClass5"
+                   table="HASHMAP_STR_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
@@ -53,382 +57,548 @@
                 <value column="SIMPINTREF"/>
             </field>
             <field name="HashMapOfString_String9"
-                   column="HASHMAP_STR_STRING9"
-                   >
+                   table="HASHMAP_STR_STRING9">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_String10"
-                   column="HASHMAP_STR_STRING10"
-                   >
+                   table="HASHMAP_STR_STRING10">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_String11"
-                   column="HASHMAP_STR_STRING11"
-                   >
+                   table="HASHMAP_STR_STRING11">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Date12"
-                   column="HASHMAP_STR_DATE12"
-                   >
+                   table="HASHMAP_STR_DATE12">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Date13"
-                   column="HASHMAP_STR_DATE13"
-                   >
+                   table="HASHMAP_STR_DATE13">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Date14"
-                   column="HASHMAP_STR_DATE14"
-                   >
+                   table="HASHMAP_STR_DATE14">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Locale15"
-                   column="HASHMAP_STR_LOCALE15"
-                   >
+                   table="HASHMAP_STR_LOCALE15">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Locale16"
-                   column="HASHMAP_STR_LOCALE16"
-                   >
+                   table="HASHMAP_STR_LOCALE16">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Locale17"
-                   column="HASHMAP_STR_LOCALE17"
-                   >
+                   table="HASHMAP_STR_LOCALE17">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigDecimal18"
-                   column="HASHMAP_STR_BIG_DECIMAL18"
-                   >
+                   table="HASHMAP_STR_BIG_DECIMAL18">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigDecimal19"
-                   column="HASHMAP_STR_BIG_DECIMAL19"
-                   >
+                   table="HASHMAP_STR_BIG_DECIMAL19">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigDecimal20"
-                   column="HASHMAP_STR_BIG_DECIMAL20"
-                   >
+                   table="HASHMAP_STR_BIG_DECIMAL20">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigInteger21"
-                   column="HASHMAP_STR_BIG_INTEGER21"
-                   >
+                   table="HASHMAP_STR_BIG_INTEGER21">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigInteger22"
-                   column="HASHMAP_STR_BIG_INTEGER22"
-                   >
+                   table="HASHMAP_STR_BIG_INTEGER22">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigInteger23"
-                   column="HASHMAP_STR_BIG_INTEGER23"
-                   >
+                   table="HASHMAP_STR_BIG_INTEGER23">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Byte24"
-                   column="HASHMAP_STR_BYTE24"
-                   >
+                   table="HASHMAP_STR_BYTE24">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Byte25"
-                   column="HASHMAP_STR_BYTE25"
-                   >
+                   table="HASHMAP_STR_BYTE25">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Byte26"
-                   column="HASHMAP_STR_BYTE26"
-                   >
+                   table="HASHMAP_STR_BYTE26">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Double27"
-                   column="HASHMAP_STR_DOUBLE27"
-                   >
+                   table="HASHMAP_STR_DOUBLE27">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Double28"
-                   column="HASHMAP_STR_DOUBLE28"
-                   >
+                   table="HASHMAP_STR_DOUBLE28">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Double29"
-                   column="HASHMAP_STR_DOUBLE29"
-                   >
+                   table="HASHMAP_STR_DOUBLE29">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Float30"
-                   column="HASHMAP_STR_FLOAT30"
-                   >
+                   table="HASHMAP_STR_FLOAT30">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Float31"
-                   column="HASHMAP_STR_FLOAT31"
-                   >
+                   table="HASHMAP_STR_FLOAT31">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Float32"
-                   column="HASHMAP_STR_FLOAT32"
-                   >
+                   table="HASHMAP_STR_FLOAT32">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Integer33"
-                   column="HASHMAP_STR_INTEGER33"
-                   >
+                   table="HASHMAP_STR_INTEGER33">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Integer34"
-                   column="HASHMAP_STR_INTEGER34"
-                   >
+                   table="HASHMAP_STR_INTEGER34">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Integer35"
-                   column="HASHMAP_STR_INTEGER35"
-                   >
+                   table="HASHMAP_STR_INTEGER35">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Long36"
-                   column="HASHMAP_STR_LONG36"
-                   >
+                   table="HASHMAP_STR_LONG36">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Long37"
-                   column="HASHMAP_STR_LONG37"
-                   >
+                   table="HASHMAP_STR_LONG37">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Long38"
-                   column="HASHMAP_STR_LONG38"
-                   >
-            </field>
-            <field name="HashMapOfString_Short39"
-                   column="HASHMAP_STR_SHORT39"
-                   >
-            </field>
-            <field name="HashMapOfString_Short40"
-                   column="HASHMAP_STR_SHORT40"
-                   >
-            </field>
-            <field name="HashMapOfString_Short41"
-                   column="HASHMAP_STR_SHORT41"
-                   >
-            </field>
-            <field name="HashMapOfString_Object42" table="HASHMAP_STR_OBJECT42">
+                   table="HASHMAP_STR_LONG38">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="OBJREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Object43" table="HASHMAP_STR_OBJECT43">
+            <field name="HashMapOfString_Short39"
+                   table="HASHMAP_STR_SHORT39">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="OBJREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleClass45" table="HASHMAP_STR_SIMPLE_CLASS45">
+            <field name="HashMapOfString_Short40"
+                   table="HASHMAP_STR_SHORT40">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleClass46" table="HASHMAP_STR_SIMPLE_CLASS46">
+            <field name="HashMapOfString_Short41"
+                   table="HASHMAP_STR_SHORT41">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface48" table="HASHMAP_STR_SIMPLE_INTERFACE48">
+            <field name="HashMapOfString_Object42"
+                   table="HASHMAP_STR_OBJECT42">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
             </field>
-            <field name="HashMapOfString_SimpleInterface49" table="HASHMAP_STR_SIMPLE_INTERFACE49">
+            <field name="HashMapOfString_Object43" table="HASHMAP_STR_OBJECT43">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
+            </field>
+            <field name="HashMapOfString_SimpleClass45"
+                   table="HASHMAP_STR_SIMPLE_CLASS45">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
+            </field>
+            <field name="HashMapOfString_SimpleClass46"
+                   table="HASHMAP_STR_SIMPLE_CLASS46">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
+            </field>
+            <field name="HashMapOfString_SimpleInterface48"
+                   table="HASHMAP_STR_SIMPLE_INTERFACE48">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
+            </field>
+            <field name="HashMapOfString_SimpleInterface49"
+                   table="HASHMAP_STR_SIMPLE_INTERFACE49">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
             </field>
             <field name="HashMapOfString_String51"
-                   column="HASHMAP_STR_STRING51"
-                   >
+                   table="HASHMAP_STR_STRING51">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_String52"
-                   column="HASHMAP_STR_STRING52"
-                   >
+                   table="HASHMAP_STR_STRING52">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Date54"
-                   column="HASHMAP_STR_DATE54"
-                   >
+                   table="HASHMAP_STR_DATE54">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Date55"
-                   column="HASHMAP_STR_DATE55"
-                   >
+                   table="HASHMAP_STR_DATE55">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Locale57"
-                   column="HASHMAP_STR_LOCALE57"
-                   >
+                   table="HASHMAP_STR_LOCALE57">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Locale58"
-                   column="HASHMAP_STR_LOCALE58"
-                   >
+                   table="HASHMAP_STR_LOCALE58">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigDecimal60"
-                   column="HASHMAP_STR_BIG_DECIMAL60"
-                   >
+                   table="HASHMAP_STR_BIG_DECIMAL60">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigDecimal61"
-                   column="HASHMAP_STR_BIG_DECIMAL61"
-                   >
+                   table="HASHMAP_STR_BIG_DECIMAL61">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigInteger63"
-                   column="HASHMAP_STR_BIG_INTEGER63"
-                   >
+                   table="HASHMAP_STR_BIG_INTEGER63">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_BigInteger64"
-                   column="HASHMAP_STR_BIG_INTEGER64"
-                   >
+                   table="HASHMAP_STR_BIG_INTEGER64">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Byte66"
-                   column="HASHMAP_STR_BYTE66"
-                   >
+                   table="HASHMAP_STR_BYTE66">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Byte67"
-                   column="HASHMAP_STR_BYTE67"
-                   >
+                   table="HASHMAP_STR_BYTE67">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Double69"
-                   column="HASHMAP_STR_DOUBLE69"
-                   >
+                   table="HASHMAP_STR_DOUBLE69">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Double70"
-                   column="HASHMAP_STR_DOUBLE70"
-                   >
+                   table="HASHMAP_STR_DOUBLE70">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Float72"
-                   column="HASHMAP_STR_FLOAT72"
-                   >
+                   table="HASHMAP_STR_FLOAT72">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Float73"
-                   column="HASHMAP_STR_FLOAT73"
-                   >
+                   table="HASHMAP_STR_FLOAT73">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Integer75"
-                   column="HASHMAP_STR_INTEGER75"
-                   >
+                   table="HASHMAP_STR_INTEGER75">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Integer76"
-                   column="HASHMAP_STR_INTEGER76"
-                   >
-            </field>
-            <field name="HashMapOfString_Long78"
-                   column="HASHMAP_STR_LONG78"
-                   >
-            </field>
-            <field name="HashMapOfString_Long79"
-                   column="HASHMAP_STR_LONG79"
-                   >
-            </field>
-            <field name="HashMapOfString_Short81"
-                   column="HASHMAP_STR_SHORT81"
-                   >
-            </field>
-            <field name="HashMapOfString_Short82"
-                   column="HASHMAP_STR_SHORT82"
-                   >
-            </field>
-            <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
+                   table="HASHMAP_STR_INTEGER76">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="OBJREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Object86" table="HASHMAP_STR_OBJECT86">
+            <field name="HashMapOfString_Long78"
+                   table="HASHMAP_STR_LONG78">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="OBJREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleClass87" table="HASHMAP_STR_SIMPLE_CLASS87">
+            <field name="HashMapOfString_Long79"
+                   table="HASHMAP_STR_LONG79">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleClass89" table="HASHMAP_STR_SIMPLE_CLASS89">
+            <field name="HashMapOfString_Short81"
+                   table="HASHMAP_STR_SHORT81">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface90" table="HASHMAP_STR_SIMPLE_INTERFACE90">
+            <field name="HashMapOfString_Short82"
+                   table="HASHMAP_STR_SHORT82">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface92" table="HASHMAP_STR_SIMPLE_INTERFACE92">
+            <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
+            </field>
+            <field name="HashMapOfString_Object86"
+                   column="HASHMAP_STR_OBJECT86">
+            </field>
+            <field name="HashMapOfString_SimpleClass87"
+                   table="HASHMAP_STR_SIMPLE_CLASS87">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
+            </field>
+            <field name="HashMapOfString_SimpleClass89"
+                   column="HASHMAP_STR_SIMPLE_CLASS89">
+            </field>
+            <field name="HashMapOfString_SimpleInterface90"
+                   table="HASHMAP_STR_SIMPLE_INTERFACE90">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </value>
             </field>
-            <field name="HashMapOfString_String93"
-                   column="HASHMAP_STR_STRING93"
-                   >
+            <field name="HashMapOfString_SimpleInterface92"
+                   column="HASHMAP_STR_SIMPLE_INTERFACE92">
             </field>
-            <field name="HashMapOfString_String95" table="HASHMAP_STR_STRING95">
+            <field name="HashMapOfString_String93"
+                   table="HASHMAP_STR_STRING93">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="STRINGVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Date96"
-                   column="HASHMAP_STR_DATE96"
-                   >
+            <field name="HashMapOfString_String95"
+                   column="HASHMAP_STR_STRING95">
             </field>
-            <field name="HashMapOfString_Date98" table="HASHMAP_STR_DATE98">
+            <field name="HashMapOfString_Date96"
+                   table="HASHMAP_STR_DATE96">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="DATEVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Locale99"
-                   column="HASHMAP_STR_LOCALE99"
-                   >
+            <field name="HashMapOfString_Date98"
+                   column="HASHMAP_STR_DATE98">
             </field>
-            <field name="HashMapOfString_Locale101" table="HASHMAP_STR_LOCALE101">
+            <field name="HashMapOfString_Locale99"
+                   table="HASHMAP_STR_LOCALE99">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="LOCALEVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_BigDecimal102"
-                   column="HASHMAP_STR_BIG_DECIMAL102"
-                   >
+            <field name="HashMapOfString_Locale101"
+                   column="HASHMAP_STR_LOCALE101">
             </field>
-            <field name="HashMapOfString_BigDecimal104" table="HASHMAP_STR_BIG_DECIMAL104">
+            <field name="HashMapOfString_BigDecimal102"
+                   table="HASHMAP_STR_BIG_DECIMAL102">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="BIG_DECIMALVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_BigInteger105"
-                   column="HASHMAP_STR_BIG_INTEGER105"
-                   >
+            <field name="HashMapOfString_BigDecimal104"
+                   column="HASHMAP_STR_BIG_DECIMAL104">
             </field>
-            <field name="HashMapOfString_BigInteger107" table="HASHMAP_STR_BIG_INTEGER107">
+            <field name="HashMapOfString_BigInteger105"
+                   table="HASHMAP_STR_BIG_INTEGER105">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="BIG_INTEGERVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Byte108"
-                   column="HASHMAP_STR_BYTE108"
-                   >
+            <field name="HashMapOfString_BigInteger107"
+                   column="HASHMAP_STR_BIG_INTEGER107">
             </field>
-            <field name="HashMapOfString_Byte110" table="HASHMAP_STR_BYTE110">
+            <field name="HashMapOfString_Byte108"
+                   table="HASHMAP_STR_BYTE108">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="BYTEVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Double111" 
-                   
-                   column="HASHMAP_STR_DOUBLE111">
+            <field name="HashMapOfString_Byte110"
+                   column="HASHMAP_STR_BYTE110">
             </field>
-            <field name="HashMapOfString_Double113" table="HASHMAP_STR_DOUBLE113">
+            <field name="HashMapOfString_Double111" 
+                   table="HASHMAP_STR_DOUBLE111">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="DOUBLEVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Float114"
-                   column="HASHMAP_STR_FLOAT114">
+            <field name="HashMapOfString_Double113"
+                   column="HASHMAP_STR_DOUBLE113">
             </field>
-            <field name="HashMapOfString_Float116" table="HASHMAP_STR_FLOAT116">
+            <field name="HashMapOfString_Float114"
+                   table="HASHMAP_STR_FLOAT114">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="FLOATVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Integer117"
-                   column="HASHMAP_STR_INTEGER117"
-                   >
+            <field name="HashMapOfString_Float116"
+                   column="HASHMAP_STR_FLOAT116">
             </field>
-            <field name="HashMapOfString_Integer119" table="HASHMAP_STR_INTEGER119">
+            <field name="HashMapOfString_Integer117"
+                   table="HASHMAP_STR_INTEGER117">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="INTEGERVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Long120"
-                   
-                    column="HASHMAP_STR_LONG120">
+            <field name="HashMapOfString_Integer119"
+                   column="HASHMAP_STR_INTEGER119">
             </field>
-            <field name="HashMapOfString_Long122" table="HASHMAP_STR_LONG122">
+            <field name="HashMapOfString_Long120"
+                    table="HASHMAP_STR_LONG120">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="LONGVAL"/>
+                <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfString_Short123"
-                   column="HASHMAP_STR_SHORT123"
-                   >
+            <field name="HashMapOfString_Long122"
+                   column="HASHMAP_STR_LONG122">
             </field>
-            <field name="HashMapOfString_Short125" table="HASHMAP_STR_SHORT125">
+            <field name="HashMapOfString_Short123"
+                   table="HASHMAP_STR_SHORT123">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value column="SHORTVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfString_Short125"
+                   column="HASHMAP_STR_SHORT125">
             </field>
         </class>
     </package>



Mime
View raw message