db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r326622 [1/7] - 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 Wed, 19 Oct 2005 18:00:24 GMT
Author: mcaisse
Date: Wed Oct 19 11:00:12 2005
New Revision: 326622

URL: http://svn.apache.org/viewcvs?rev=326622&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/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-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=326622&r1=326621&r2=326622&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 Wed Oct 19 11:00:12 2005
@@ -358,80 +358,80 @@
 <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">
+<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>
 </field>
-<field name="HashMapOfString_Locale101" >
-<map key-type="String" value-type="java.util.Locale" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_BigDecimal104" >
-<map key-type="String" value-type="java.math.BigDecimal" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_BigInteger107" >
-<map key-type="String" value-type="java.math.BigInteger" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_Byte110" >
-<map key-type="String" value-type="Byte" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_Double113" >
-<map key-type="String" value-type="Double" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_Float116" >
-<map key-type="String" value-type="Float" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_Integer119" >
-<map key-type="String" value-type="Integer" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_Long122" >
-<map key-type="String" value-type="Long" serialized="true">
+<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>
 </field>
-<field name="HashMapOfString_Short125" >
-<map key-type="String" value-type="Short" serialized="true">
+<field name="HashMapOfString_Short125" serialized="true">
+<map key-type="String" value-type="Short" >
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo?rev=326622&r1=326621&r2=326622&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo Wed Oct 19 11:00:12 2005
@@ -6,395 +6,432 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashtableStringKeyCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="HashtableOfString_Object0" >
-<map  key-type="String" value-type="Object">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_SimpleClass3" >
-<map  key-type="String" value-type="SimpleClass">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_SimpleInterface6" >
-<map  key-type="String" value-type="SimpleInterface">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_String11" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Byte26" >
-<map  key-type="String" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Double29" >
-<map  key-type="String" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Float32" >
-<map  key-type="String" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Integer35" >
-<map  key-type="String" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Long38" >
-<map  key-type="String" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Short41" >
-<map  key-type="String" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_Object43" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
+<field name="HashtableOfString_Object43">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_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="HashtableOfString_Object84" >
-<map  key-type="String" embedded-key="false" value-type="Object">
+<field name="HashtableOfString_Object84">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Object86" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
+<field name="HashtableOfString_Object86" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashtableOfString_SimpleClass87" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass">
+<field name="HashtableOfString_SimpleClass87">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashtableOfString_SimpleClass89" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
+<field name="HashtableOfString_SimpleClass89" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashtableOfString_SimpleInterface90" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface">
+<field name="HashtableOfString_SimpleInterface90">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="HashtableOfString_SimpleInterface92" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
+<field name="HashtableOfString_SimpleInterface92" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="HashtableOfString_String93" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map key-type="String" value-type="String">
 </map>
 </field>
-<field name="HashtableOfString_String95" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfString_String95" serialized="true">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_Date98" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
+<field name="HashtableOfString_Date98" serialized="true">
+<map key-type="String" value-type="java.util.Date" >
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_Locale101" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
+<field name="HashtableOfString_Locale101" serialized="true">
+<map key-type="String" value-type="java.util.Locale" >
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_BigDecimal104" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
+<field name="HashtableOfString_BigDecimal104" serialized="true">
+<map key-type="String" value-type="java.math.BigDecimal" >
 </map>
 </field>
 <field name="HashtableOfString_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="HashtableOfString_BigInteger107" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
+<field name="HashtableOfString_BigInteger107" serialized="true">
+<map key-type="String" value-type="java.math.BigInteger" >
 </map>
 </field>
 <field name="HashtableOfString_Byte108" >
-<map  key-type="String" embedded-key="false" value-type="Byte">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
-<field name="HashtableOfString_Byte110" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
+<field name="HashtableOfString_Byte110" serialized="true">
+<map key-type="String" value-type="Byte" >
 </map>
 </field>
 <field name="HashtableOfString_Double111" >
-<map  key-type="String" embedded-key="false" value-type="Double">
+<map key-type="String" value-type="Double">
 </map>
 </field>
-<field name="HashtableOfString_Double113" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
+<field name="HashtableOfString_Double113" serialized="true">
+<map key-type="String" value-type="Double" >
 </map>
 </field>
 <field name="HashtableOfString_Float114" >
-<map  key-type="String" embedded-key="false" value-type="Float">
+<map key-type="String" value-type="Float">
 </map>
 </field>
-<field name="HashtableOfString_Float116" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
+<field name="HashtableOfString_Float116" serialized="true">
+<map key-type="String" value-type="Float" >
 </map>
 </field>
 <field name="HashtableOfString_Integer117" >
-<map  key-type="String" embedded-key="false" value-type="Integer">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
-<field name="HashtableOfString_Integer119" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
+<field name="HashtableOfString_Integer119" serialized="true">
+<map key-type="String" value-type="Integer" >
 </map>
 </field>
 <field name="HashtableOfString_Long120" >
-<map  key-type="String" embedded-key="false" value-type="Long">
+<map key-type="String" value-type="Long">
 </map>
 </field>
-<field name="HashtableOfString_Long122" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
+<field name="HashtableOfString_Long122" serialized="true">
+<map key-type="String" value-type="Long" >
 </map>
 </field>
 <field name="HashtableOfString_Short123" >
-<map  key-type="String" embedded-key="false" value-type="Short">
+<map key-type="String" value-type="Short">
 </map>
 </field>
-<field name="HashtableOfString_Short125" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="false">
+<field name="HashtableOfString_Short125" serialized="true">
+<map key-type="String" value-type="Short" >
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo?rev=326622&r1=326621&r2=326622&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo Wed Oct 19 11:00:12 2005
@@ -6,395 +6,432 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.MapStringKeyCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="MapOfString_Object0" >
-<map  key-type="String" value-type="Object">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_SimpleClass3" >
-<map  key-type="String" value-type="SimpleClass">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_SimpleInterface6" >
-<map  key-type="String" value-type="SimpleInterface">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_String11" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_Byte26" >
-<map  key-type="String" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_Double29" >
-<map  key-type="String" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_Float32" >
-<map  key-type="String" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_Integer35" >
-<map  key-type="String" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_Long38" >
-<map  key-type="String" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_Short41" >
-<map  key-type="String" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_Object43" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
+<field name="MapOfString_Object43">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_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="MapOfString_Object84" >
-<map  key-type="String" embedded-key="false" value-type="Object">
+<field name="MapOfString_Object84">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="MapOfString_Object86" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
+<field name="MapOfString_Object86" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="MapOfString_SimpleClass87" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass">
+<field name="MapOfString_SimpleClass87">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="MapOfString_SimpleClass89" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
+<field name="MapOfString_SimpleClass89" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="MapOfString_SimpleInterface90" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface">
+<field name="MapOfString_SimpleInterface90">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="MapOfString_SimpleInterface92" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
+<field name="MapOfString_SimpleInterface92" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="MapOfString_String93" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map key-type="String" value-type="String">
 </map>
 </field>
-<field name="MapOfString_String95" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfString_String95" serialized="true">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_Date98" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
+<field name="MapOfString_Date98" serialized="true">
+<map key-type="String" value-type="java.util.Date" >
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_Locale101" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
+<field name="MapOfString_Locale101" serialized="true">
+<map key-type="String" value-type="java.util.Locale" >
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_BigDecimal104" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
+<field name="MapOfString_BigDecimal104" serialized="true">
+<map key-type="String" value-type="java.math.BigDecimal" >
 </map>
 </field>
 <field name="MapOfString_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="MapOfString_BigInteger107" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
+<field name="MapOfString_BigInteger107" serialized="true">
+<map key-type="String" value-type="java.math.BigInteger" >
 </map>
 </field>
 <field name="MapOfString_Byte108" >
-<map  key-type="String" embedded-key="false" value-type="Byte">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
-<field name="MapOfString_Byte110" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
+<field name="MapOfString_Byte110" serialized="true">
+<map key-type="String" value-type="Byte" >
 </map>
 </field>
 <field name="MapOfString_Double111" >
-<map  key-type="String" embedded-key="false" value-type="Double">
+<map key-type="String" value-type="Double">
 </map>
 </field>
-<field name="MapOfString_Double113" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
+<field name="MapOfString_Double113" serialized="true">
+<map key-type="String" value-type="Double" >
 </map>
 </field>
 <field name="MapOfString_Float114" >
-<map  key-type="String" embedded-key="false" value-type="Float">
+<map key-type="String" value-type="Float">
 </map>
 </field>
-<field name="MapOfString_Float116" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
+<field name="MapOfString_Float116" serialized="true">
+<map key-type="String" value-type="Float" >
 </map>
 </field>
 <field name="MapOfString_Integer117" >
-<map  key-type="String" embedded-key="false" value-type="Integer">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
-<field name="MapOfString_Integer119" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
+<field name="MapOfString_Integer119" serialized="true">
+<map key-type="String" value-type="Integer" >
 </map>
 </field>
 <field name="MapOfString_Long120" >
-<map  key-type="String" embedded-key="false" value-type="Long">
+<map key-type="String" value-type="Long">
 </map>
 </field>
-<field name="MapOfString_Long122" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
+<field name="MapOfString_Long122" serialized="true">
+<map key-type="String" value-type="Long" >
 </map>
 </field>
 <field name="MapOfString_Short123" >
-<map  key-type="String" embedded-key="false" value-type="Short">
+<map key-type="String" value-type="Short">
 </map>
 </field>
-<field name="MapOfString_Short125" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="false">
+<field name="MapOfString_Short125" serialized="true">
+<map key-type="String" value-type="Short" >
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo?rev=326622&r1=326621&r2=326622&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo Wed Oct 19 11:00:12 2005
@@ -6,395 +6,432 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeMapStringKeyCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="TreeMapOfString_Object0" >
-<map  key-type="String" value-type="Object">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_SimpleClass3" >
-<map  key-type="String" value-type="SimpleClass">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_SimpleInterface6" >
-<map  key-type="String" value-type="SimpleInterface">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_String11" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Byte26" >
-<map  key-type="String" value-type="Byte" embedded-value="false">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Double29" >
-<map  key-type="String" value-type="Double" embedded-value="false">
+<map key-type="String" value-type="Double">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Float32" >
-<map  key-type="String" value-type="Float" embedded-value="false">
+<map key-type="String" value-type="Float">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Integer35" >
-<map  key-type="String" value-type="Integer" embedded-value="false">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Long38" >
-<map  key-type="String" value-type="Long" embedded-value="false">
+<map key-type="String" value-type="Long">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Short41" >
-<map  key-type="String" value-type="Short" embedded-value="false">
+<map key-type="String" value-type="Short">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_Object43" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
+<field name="TreeMapOfString_Object43">
+<map key-type="String" value-type="SimpleClass"
+   embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_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="TreeMapOfString_Object84" >
-<map  key-type="String" embedded-key="false" value-type="Object">
+<field name="TreeMapOfString_Object84">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Object86" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
+<field name="TreeMapOfString_Object86" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleClass87" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass">
+<field name="TreeMapOfString_SimpleClass87">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleClass89" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
+<field name="TreeMapOfString_SimpleClass89" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleInterface90" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface">
+<field name="TreeMapOfString_SimpleInterface90">
+<map key-type="String" value-type="SimpleClass"
+     embedded-key="true" serialized-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleInterface92" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
+<field name="TreeMapOfString_SimpleInterface92" serialized="true">
+<map key-type="String" value-type="SimpleClass">
 </map>
 </field>
 <field name="TreeMapOfString_String93" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map key-type="String" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfString_String95" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfString_String95" serialized="true">
+<map key-type="String" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_Date98" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
+<field name="TreeMapOfString_Date98" serialized="true">
+<map key-type="String" value-type="java.util.Date" >
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_Locale101" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
+<field name="TreeMapOfString_Locale101" serialized="true">
+<map key-type="String" value-type="java.util.Locale" >
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_BigDecimal104" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
+<field name="TreeMapOfString_BigDecimal104" serialized="true">
+<map key-type="String" value-type="java.math.BigDecimal" >
 </map>
 </field>
 <field name="TreeMapOfString_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="TreeMapOfString_BigInteger107" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
+<field name="TreeMapOfString_BigInteger107" serialized="true">
+<map key-type="String" value-type="java.math.BigInteger" >
 </map>
 </field>
 <field name="TreeMapOfString_Byte108" >
-<map  key-type="String" embedded-key="false" value-type="Byte">
+<map key-type="String" value-type="Byte">
 </map>
 </field>
-<field name="TreeMapOfString_Byte110" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
+<field name="TreeMapOfString_Byte110" serialized="true">
+<map key-type="String" value-type="Byte" >
 </map>
 </field>
 <field name="TreeMapOfString_Double111" >
-<map  key-type="String" embedded-key="false" value-type="Double">
+<map key-type="String" value-type="Double">
 </map>
 </field>
-<field name="TreeMapOfString_Double113" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
+<field name="TreeMapOfString_Double113" serialized="true">
+<map key-type="String" value-type="Double" >
 </map>
 </field>
 <field name="TreeMapOfString_Float114" >
-<map  key-type="String" embedded-key="false" value-type="Float">
+<map key-type="String" value-type="Float">
 </map>
 </field>
-<field name="TreeMapOfString_Float116" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
+<field name="TreeMapOfString_Float116" serialized="true">
+<map key-type="String" value-type="Float" >
 </map>
 </field>
 <field name="TreeMapOfString_Integer117" >
-<map  key-type="String" embedded-key="false" value-type="Integer">
+<map key-type="String" value-type="Integer">
 </map>
 </field>
-<field name="TreeMapOfString_Integer119" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
+<field name="TreeMapOfString_Integer119" serialized="true">
+<map key-type="String" value-type="Integer" >
 </map>
 </field>
 <field name="TreeMapOfString_Long120" >
-<map  key-type="String" embedded-key="false" value-type="Long">
+<map key-type="String" value-type="Long">
 </map>
 </field>
-<field name="TreeMapOfString_Long122" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
+<field name="TreeMapOfString_Long122" serialized="true">
+<map key-type="String" value-type="Long" >
 </map>
 </field>
 <field name="TreeMapOfString_Short123" >
-<map  key-type="String" embedded-key="false" value-type="Short">
+<map key-type="String" value-type="Short">
 </map>
 </field>
-<field name="TreeMapOfString_Short125" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="false">
+<field name="TreeMapOfString_Short125" serialized="true">
+<map key-type="String" value-type="Short" >
 </map>
 </field>
 </class>



Mime
View raw message