You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/11/03 01:25:03 UTC

svn commit: r330395 [2/8] - 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...

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo?rev=330395&r1=330394&r2=330395&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo Wed Nov  2 16:24:51 2005
@@ -12,23 +12,25 @@
 </map>
 </field>
 <field name="HashMapOfObject_String2" >
-<map  key-type="Object" value-type="String" embedded-value="false">
+<map  key-type="Object" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="HashMapOfObject_String3" >
-<map  key-type="Object" embedded-key="true" value-type="String">
+<map  key-type="Object" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfObject_String4" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Object" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfObject_String6" >
-<map  key-type="Object" embedded-key="false" value-type="String">
+<map  key-type="Object" embedded-value="true" value-type="String">
 </map>
 </field>
-<field name="HashMapOfObject_String8" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfObject_String8" serialized="true">
+<map  key-type="Object" value-type="String">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String9" >
@@ -40,23 +42,25 @@
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String11" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="false">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String12" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String13" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String">
+<map  key-type="SimpleClass" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfSimpleClass_String17" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfSimpleClass_String17" serialized="true">
+<map  key-type="SimpleClass" value-type="String">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String18" >
@@ -68,23 +72,25 @@
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String20" >
-<map  key-type="SimpleInterface" value-type="String" embedded-value="false">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String21" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String22" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleInterface" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String24" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String">
+<map  key-type="SimpleInterface" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfSimpleInterface_String26" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfSimpleInterface_String26" serialized="true">
+<map  key-type="SimpleInterface" value-type="String">
 </map>
 </field>
 <field name="HashMapOfString_String27" >
@@ -92,27 +98,29 @@
 </map>
 </field>
 <field name="HashMapOfString_String28" >
-<map  key-type="String" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String29" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String30" >
-<map  key-type="String" embedded-key="true" value-type="String">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashMapOfString_String31" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_String33" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_String35" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfString_String35" serialized="true">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashMapOfDate_String36" >
@@ -120,27 +128,29 @@
 </map>
 </field>
 <field name="HashMapOfDate_String37" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfDate_String38" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="false">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfDate_String39" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="HashMapOfDate_String40" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfDate_String42" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfDate_String44" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfDate_String44" serialized="true">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="HashMapOfBigDecimal_String45" >
@@ -148,27 +158,29 @@
 </map>
 </field>
 <field name="HashMapOfBigDecimal_String46" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfBigDecimal_String47" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfBigDecimal_String48" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="HashMapOfBigDecimal_String49" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfBigDecimal_String51" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfBigDecimal_String53" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfBigDecimal_String53" serialized="true">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="HashMapOfBigInteger_String54" >
@@ -176,27 +188,29 @@
 </map>
 </field>
 <field name="HashMapOfBigInteger_String55" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfBigInteger_String56" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfBigInteger_String57" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="HashMapOfBigInteger_String58" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfBigInteger_String60" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfBigInteger_String62" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfBigInteger_String62" serialized="true">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="HashMapOfByte_String63" >
@@ -204,27 +218,29 @@
 </map>
 </field>
 <field name="HashMapOfByte_String64" >
-<map  key-type="Byte" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfByte_String65" >
-<map  key-type="Byte" value-type="String" embedded-value="false">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfByte_String66" >
-<map  key-type="Byte" embedded-key="true" value-type="String">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="HashMapOfByte_String67" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfByte_String69" >
-<map  key-type="Byte" embedded-key="false" value-type="String">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfByte_String71" >
-<map  key-type="Byte" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfByte_String71" serialized="true">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="HashMapOfDouble_String72" >
@@ -232,27 +248,29 @@
 </map>
 </field>
 <field name="HashMapOfDouble_String73" >
-<map  key-type="Double" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfDouble_String74" >
-<map  key-type="Double" value-type="String" embedded-value="false">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfDouble_String75" >
-<map  key-type="Double" embedded-key="true" value-type="String">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="HashMapOfDouble_String76" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfDouble_String78" >
-<map  key-type="Double" embedded-key="false" value-type="String">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfDouble_String80" >
-<map  key-type="Double" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfDouble_String80" serialized="true">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="HashMapOfFloat_String81" >
@@ -260,27 +278,29 @@
 </map>
 </field>
 <field name="HashMapOfFloat_String82" >
-<map  key-type="Float" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfFloat_String83" >
-<map  key-type="Float" value-type="String" embedded-value="false">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfFloat_String84" >
-<map  key-type="Float" embedded-key="true" value-type="String">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="HashMapOfFloat_String85" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfFloat_String87" >
-<map  key-type="Float" embedded-key="false" value-type="String">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfFloat_String89" >
-<map  key-type="Float" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfFloat_String89" serialized="true">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="HashMapOfInteger_String90" >
@@ -288,27 +308,29 @@
 </map>
 </field>
 <field name="HashMapOfInteger_String91" >
-<map  key-type="Integer" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfInteger_String92" >
-<map  key-type="Integer" value-type="String" embedded-value="false">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfInteger_String93" >
-<map  key-type="Integer" embedded-key="true" value-type="String">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="HashMapOfInteger_String94" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfInteger_String96" >
-<map  key-type="Integer" embedded-key="false" value-type="String">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfInteger_String98" >
-<map  key-type="Integer" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfInteger_String98" serialized="true">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="HashMapOfLong_String99" >
@@ -316,27 +338,29 @@
 </map>
 </field>
 <field name="HashMapOfLong_String100" >
-<map  key-type="Long" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfLong_String101" >
-<map  key-type="Long" value-type="String" embedded-value="false">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfLong_String102" >
-<map  key-type="Long" embedded-key="true" value-type="String">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="HashMapOfLong_String103" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfLong_String105" >
-<map  key-type="Long" embedded-key="false" value-type="String">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfLong_String107" >
-<map  key-type="Long" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfLong_String107" serialized="true">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="HashMapOfShort_String108" >
@@ -344,27 +368,29 @@
 </map>
 </field>
 <field name="HashMapOfShort_String109" >
-<map  key-type="Short" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfShort_String110" >
-<map  key-type="Short" value-type="String" embedded-value="false">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfShort_String111" >
-<map  key-type="Short" embedded-key="true" value-type="String">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 <field name="HashMapOfShort_String112" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfShort_String114" >
-<map  key-type="Short" embedded-key="false" value-type="String">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfShort_String116" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashMapOfShort_String116" serialized="true">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo?rev=330395&r1=330394&r2=330395&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo Wed Nov  2 16:24:51 2005
@@ -12,23 +12,25 @@
 </map>
 </field>
 <field name="HashtableOfObject_String2" >
-<map  key-type="Object" value-type="String" embedded-value="false">
+<map  key-type="Object" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="HashtableOfObject_String3" >
-<map  key-type="Object" embedded-key="true" value-type="String">
+<map  key-type="Object" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfObject_String4" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Object" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashtableOfObject_String6" >
-<map  key-type="Object" embedded-key="false" value-type="String">
+<map  key-type="Object" embedded-value="true" value-type="String">
 </map>
 </field>
-<field name="HashtableOfObject_String8" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfObject_String8" serialized="true">
+<map  key-type="Object" value-type="String">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String9" >
@@ -40,23 +42,25 @@
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String11" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="false">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String12" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String13" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String15" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String">
+<map  key-type="SimpleClass" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfSimpleClass_String17" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfSimpleClass_String17" serialized="true">
+<map  key-type="SimpleClass" value-type="String">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String18" >
@@ -68,23 +72,25 @@
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String20" >
-<map  key-type="SimpleInterface" value-type="String" embedded-value="false">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String21" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String22" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleInterface" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String24" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String">
+<map  key-type="SimpleInterface" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfSimpleInterface_String26" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfSimpleInterface_String26" serialized="true">
+<map  key-type="SimpleInterface" value-type="String">
 </map>
 </field>
 <field name="HashtableOfString_String27" >
@@ -92,27 +98,29 @@
 </map>
 </field>
 <field name="HashtableOfString_String28" >
-<map  key-type="String" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfString_String29" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfString_String30" >
-<map  key-type="String" embedded-key="true" value-type="String">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashtableOfString_String31" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfString_String33" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_String35" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfString_String35" serialized="true">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="HashtableOfDate_String36" >
@@ -120,27 +128,29 @@
 </map>
 </field>
 <field name="HashtableOfDate_String37" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfDate_String38" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="false">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfDate_String39" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="HashtableOfDate_String40" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfDate_String42" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfDate_String44" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfDate_String44" serialized="true">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="HashtableOfBigDecimal_String45" >
@@ -148,27 +158,29 @@
 </map>
 </field>
 <field name="HashtableOfBigDecimal_String46" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfBigDecimal_String47" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfBigDecimal_String48" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="HashtableOfBigDecimal_String49" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfBigDecimal_String51" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfBigDecimal_String53" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfBigDecimal_String53" serialized="true">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="HashtableOfBigInteger_String54" >
@@ -176,27 +188,29 @@
 </map>
 </field>
 <field name="HashtableOfBigInteger_String55" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfBigInteger_String56" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfBigInteger_String57" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="HashtableOfBigInteger_String58" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfBigInteger_String60" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfBigInteger_String62" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfBigInteger_String62" serialized="true">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="HashtableOfByte_String63" >
@@ -204,27 +218,29 @@
 </map>
 </field>
 <field name="HashtableOfByte_String64" >
-<map  key-type="Byte" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfByte_String65" >
-<map  key-type="Byte" value-type="String" embedded-value="false">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfByte_String66" >
-<map  key-type="Byte" embedded-key="true" value-type="String">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="HashtableOfByte_String67" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfByte_String69" >
-<map  key-type="Byte" embedded-key="false" value-type="String">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfByte_String71" >
-<map  key-type="Byte" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfByte_String71" serialized="true">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="HashtableOfDouble_String72" >
@@ -232,27 +248,29 @@
 </map>
 </field>
 <field name="HashtableOfDouble_String73" >
-<map  key-type="Double" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfDouble_String74" >
-<map  key-type="Double" value-type="String" embedded-value="false">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfDouble_String75" >
-<map  key-type="Double" embedded-key="true" value-type="String">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="HashtableOfDouble_String76" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfDouble_String78" >
-<map  key-type="Double" embedded-key="false" value-type="String">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfDouble_String80" >
-<map  key-type="Double" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfDouble_String80" serialized="true">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="HashtableOfFloat_String81" >
@@ -260,27 +278,29 @@
 </map>
 </field>
 <field name="HashtableOfFloat_String82" >
-<map  key-type="Float" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfFloat_String83" >
-<map  key-type="Float" value-type="String" embedded-value="false">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfFloat_String84" >
-<map  key-type="Float" embedded-key="true" value-type="String">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="HashtableOfFloat_String85" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfFloat_String87" >
-<map  key-type="Float" embedded-key="false" value-type="String">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfFloat_String89" >
-<map  key-type="Float" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfFloat_String89" serialized="true">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="HashtableOfInteger_String90" >
@@ -288,27 +308,29 @@
 </map>
 </field>
 <field name="HashtableOfInteger_String91" >
-<map  key-type="Integer" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfInteger_String92" >
-<map  key-type="Integer" value-type="String" embedded-value="false">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfInteger_String93" >
-<map  key-type="Integer" embedded-key="true" value-type="String">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="HashtableOfInteger_String94" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfInteger_String96" >
-<map  key-type="Integer" embedded-key="false" value-type="String">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfInteger_String98" >
-<map  key-type="Integer" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfInteger_String98" serialized="true">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="HashtableOfLong_String99" >
@@ -316,27 +338,29 @@
 </map>
 </field>
 <field name="HashtableOfLong_String100" >
-<map  key-type="Long" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfLong_String101" >
-<map  key-type="Long" value-type="String" embedded-value="false">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfLong_String102" >
-<map  key-type="Long" embedded-key="true" value-type="String">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="HashtableOfLong_String103" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfLong_String105" >
-<map  key-type="Long" embedded-key="false" value-type="String">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfLong_String107" >
-<map  key-type="Long" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfLong_String107" serialized="true">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="HashtableOfShort_String108" >
@@ -344,27 +368,29 @@
 </map>
 </field>
 <field name="HashtableOfShort_String109" >
-<map  key-type="Short" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfShort_String110" >
-<map  key-type="Short" value-type="String" embedded-value="false">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfShort_String111" >
-<map  key-type="Short" embedded-key="true" value-type="String">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 <field name="HashtableOfShort_String112" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfShort_String114" >
-<map  key-type="Short" embedded-key="false" value-type="String">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfShort_String116" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="false">
+<field name="HashtableOfShort_String116" serialized="true">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo?rev=330395&r1=330394&r2=330395&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo Wed Nov  2 16:24:51 2005
@@ -12,23 +12,25 @@
 </map>
 </field>
 <field name="MapOfObject_String2" >
-<map  key-type="Object" value-type="String" embedded-value="false">
+<map  key-type="Object" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="MapOfObject_String3" >
-<map  key-type="Object" embedded-key="true" value-type="String">
+<map  key-type="Object" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfObject_String4" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Object" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="MapOfObject_String6" >
-<map  key-type="Object" embedded-key="false" value-type="String">
+<map  key-type="Object" embedded-value="true" value-type="String">
 </map>
 </field>
-<field name="MapOfObject_String8" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfObject_String8" serialized="true">
+<map  key-type="Object" value-type="String">
 </map>
 </field>
 <field name="MapOfSimpleClass_String9" >
@@ -40,23 +42,25 @@
 </map>
 </field>
 <field name="MapOfSimpleClass_String11" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="false">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="MapOfSimpleClass_String12" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleClass_String13" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="MapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String">
+<map  key-type="SimpleClass" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfSimpleClass_String17" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfSimpleClass_String17" serialized="true">
+<map  key-type="SimpleClass" value-type="String">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String18" >
@@ -68,23 +72,25 @@
 </map>
 </field>
 <field name="MapOfSimpleInterface_String20" >
-<map  key-type="SimpleInterface" value-type="String" embedded-value="false">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String21" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String22" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleInterface" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String24" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String">
+<map  key-type="SimpleInterface" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfSimpleInterface_String26" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfSimpleInterface_String26" serialized="true">
+<map  key-type="SimpleInterface" value-type="String">
 </map>
 </field>
 <field name="MapOfString_String27" >
@@ -92,27 +98,29 @@
 </map>
 </field>
 <field name="MapOfString_String28" >
-<map  key-type="String" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfString_String29" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfString_String30" >
-<map  key-type="String" embedded-key="true" value-type="String">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="MapOfString_String31" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfString_String33" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_String35" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfString_String35" serialized="true">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="MapOfDate_String36" >
@@ -120,27 +128,29 @@
 </map>
 </field>
 <field name="MapOfDate_String37" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfDate_String38" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="false">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfDate_String39" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="MapOfDate_String40" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfDate_String42" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfDate_String44" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfDate_String44" serialized="true">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="MapOfBigDecimal_String45" >
@@ -148,27 +158,29 @@
 </map>
 </field>
 <field name="MapOfBigDecimal_String46" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfBigDecimal_String47" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfBigDecimal_String48" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="MapOfBigDecimal_String49" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfBigDecimal_String51" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfBigDecimal_String53" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfBigDecimal_String53" serialized="true">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="MapOfBigInteger_String54" >
@@ -176,27 +188,29 @@
 </map>
 </field>
 <field name="MapOfBigInteger_String55" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfBigInteger_String56" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfBigInteger_String57" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="MapOfBigInteger_String58" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfBigInteger_String60" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfBigInteger_String62" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfBigInteger_String62" serialized="true">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="MapOfByte_String63" >
@@ -204,27 +218,29 @@
 </map>
 </field>
 <field name="MapOfByte_String64" >
-<map  key-type="Byte" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfByte_String65" >
-<map  key-type="Byte" value-type="String" embedded-value="false">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfByte_String66" >
-<map  key-type="Byte" embedded-key="true" value-type="String">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="MapOfByte_String67" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfByte_String69" >
-<map  key-type="Byte" embedded-key="false" value-type="String">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfByte_String71" >
-<map  key-type="Byte" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfByte_String71" serialized="true">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="MapOfDouble_String72" >
@@ -232,27 +248,29 @@
 </map>
 </field>
 <field name="MapOfDouble_String73" >
-<map  key-type="Double" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfDouble_String74" >
-<map  key-type="Double" value-type="String" embedded-value="false">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfDouble_String75" >
-<map  key-type="Double" embedded-key="true" value-type="String">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="MapOfDouble_String76" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfDouble_String78" >
-<map  key-type="Double" embedded-key="false" value-type="String">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfDouble_String80" >
-<map  key-type="Double" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfDouble_String80" serialized="true">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="MapOfFloat_String81" >
@@ -260,27 +278,29 @@
 </map>
 </field>
 <field name="MapOfFloat_String82" >
-<map  key-type="Float" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfFloat_String83" >
-<map  key-type="Float" value-type="String" embedded-value="false">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfFloat_String84" >
-<map  key-type="Float" embedded-key="true" value-type="String">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="MapOfFloat_String85" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfFloat_String87" >
-<map  key-type="Float" embedded-key="false" value-type="String">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfFloat_String89" >
-<map  key-type="Float" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfFloat_String89" serialized="true">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="MapOfInteger_String90" >
@@ -288,27 +308,29 @@
 </map>
 </field>
 <field name="MapOfInteger_String91" >
-<map  key-type="Integer" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfInteger_String92" >
-<map  key-type="Integer" value-type="String" embedded-value="false">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfInteger_String93" >
-<map  key-type="Integer" embedded-key="true" value-type="String">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="MapOfInteger_String94" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfInteger_String96" >
-<map  key-type="Integer" embedded-key="false" value-type="String">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfInteger_String98" >
-<map  key-type="Integer" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfInteger_String98" serialized="true">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="MapOfLong_String99" >
@@ -316,27 +338,29 @@
 </map>
 </field>
 <field name="MapOfLong_String100" >
-<map  key-type="Long" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfLong_String101" >
-<map  key-type="Long" value-type="String" embedded-value="false">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfLong_String102" >
-<map  key-type="Long" embedded-key="true" value-type="String">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="MapOfLong_String103" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfLong_String105" >
-<map  key-type="Long" embedded-key="false" value-type="String">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfLong_String107" >
-<map  key-type="Long" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfLong_String107" serialized="true">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="MapOfShort_String108" >
@@ -344,27 +368,29 @@
 </map>
 </field>
 <field name="MapOfShort_String109" >
-<map  key-type="Short" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfShort_String110" >
-<map  key-type="Short" value-type="String" embedded-value="false">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfShort_String111" >
-<map  key-type="Short" embedded-key="true" value-type="String">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 <field name="MapOfShort_String112" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfShort_String114" >
-<map  key-type="Short" embedded-key="false" value-type="String">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfShort_String116" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="false">
+<field name="MapOfShort_String116" serialized="true">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 </class>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo?rev=330395&r1=330394&r2=330395&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo Wed Nov  2 16:24:51 2005
@@ -12,23 +12,25 @@
 </map>
 </field>
 <field name="TreeMapOfObject_String2" >
-<map  key-type="Object" value-type="String" embedded-value="false">
+<map  key-type="Object" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="TreeMapOfObject_String3" >
-<map  key-type="Object" embedded-key="true" value-type="String">
+<map  key-type="Object" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfObject_String4" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Object" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="TreeMapOfObject_String6" >
-<map  key-type="Object" embedded-key="false" value-type="String">
+<map  key-type="Object" embedded-value="true" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfObject_String8" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfObject_String8" serialized="true">
+<map  key-type="Object" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String9" >
@@ -40,23 +42,25 @@
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String11" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="false">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String12" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String13" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String">
+<map  key-type="SimpleClass" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfSimpleClass_String17" >
-<map  key-type="SimpleClass" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfSimpleClass_String17" serialized="true">
+<map  key-type="SimpleClass" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String18" >
@@ -68,23 +72,25 @@
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String20" >
-<map  key-type="SimpleInterface" value-type="String" embedded-value="false">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="false" embedded-value="false">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String21" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String">
+<map  key-type="SimpleInterface" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String22" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="SimpleInterface" value-type="String" embedded-key="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String24" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String">
+<map  key-type="SimpleInterface" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfSimpleInterface_String26" >
-<map  key-type="SimpleInterface" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfSimpleInterface_String26" serialized="true">
+<map  key-type="SimpleInterface" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfString_String27" >
@@ -92,27 +98,29 @@
 </map>
 </field>
 <field name="TreeMapOfString_String28" >
-<map  key-type="String" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfString_String29" >
-<map  key-type="String" value-type="String" embedded-value="false">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfString_String30" >
-<map  key-type="String" embedded-key="true" value-type="String">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfString_String31" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="String" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfString_String33" >
-<map  key-type="String" embedded-key="false" value-type="String">
+<map  key-type="String" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_String35" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfString_String35" serialized="true">
+<map  key-type="String" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfDate_String36" >
@@ -120,27 +128,29 @@
 </map>
 </field>
 <field name="TreeMapOfDate_String37" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfDate_String38" >
-<map  key-type="java.util.Date" value-type="String" embedded-value="false">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfDate_String39" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfDate_String40" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.util.Date" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfDate_String42" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String">
+<map  key-type="java.util.Date" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfDate_String44" >
-<map  key-type="java.util.Date" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfDate_String44" serialized="true">
+<map  key-type="java.util.Date" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfBigDecimal_String45" >
@@ -148,27 +158,29 @@
 </map>
 </field>
 <field name="TreeMapOfBigDecimal_String46" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfBigDecimal_String47" >
-<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfBigDecimal_String48" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfBigDecimal_String49" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigDecimal" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfBigDecimal_String51" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigDecimal" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfBigDecimal_String53" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfBigDecimal_String53" serialized="true">
+<map  key-type="java.math.BigDecimal" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfBigInteger_String54" >
@@ -176,27 +188,29 @@
 </map>
 </field>
 <field name="TreeMapOfBigInteger_String55" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfBigInteger_String56" >
-<map  key-type="java.math.BigInteger" value-type="String" embedded-value="false">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfBigInteger_String57" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfBigInteger_String58" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="java.math.BigInteger" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfBigInteger_String60" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
+<map  key-type="java.math.BigInteger" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfBigInteger_String62" >
-<map  key-type="java.math.BigInteger" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfBigInteger_String62" serialized="true">
+<map  key-type="java.math.BigInteger" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfByte_String63" >
@@ -204,27 +218,29 @@
 </map>
 </field>
 <field name="TreeMapOfByte_String64" >
-<map  key-type="Byte" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfByte_String65" >
-<map  key-type="Byte" value-type="String" embedded-value="false">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfByte_String66" >
-<map  key-type="Byte" embedded-key="true" value-type="String">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfByte_String67" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Byte" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfByte_String69" >
-<map  key-type="Byte" embedded-key="false" value-type="String">
+<map  key-type="Byte" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfByte_String71" >
-<map  key-type="Byte" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfByte_String71" serialized="true">
+<map  key-type="Byte" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfDouble_String72" >
@@ -232,27 +248,29 @@
 </map>
 </field>
 <field name="TreeMapOfDouble_String73" >
-<map  key-type="Double" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfDouble_String74" >
-<map  key-type="Double" value-type="String" embedded-value="false">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfDouble_String75" >
-<map  key-type="Double" embedded-key="true" value-type="String">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfDouble_String76" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Double" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfDouble_String78" >
-<map  key-type="Double" embedded-key="false" value-type="String">
+<map  key-type="Double" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfDouble_String80" >
-<map  key-type="Double" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfDouble_String80" serialized="true">
+<map  key-type="Double" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfFloat_String81" >
@@ -260,27 +278,29 @@
 </map>
 </field>
 <field name="TreeMapOfFloat_String82" >
-<map  key-type="Float" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfFloat_String83" >
-<map  key-type="Float" value-type="String" embedded-value="false">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfFloat_String84" >
-<map  key-type="Float" embedded-key="true" value-type="String">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfFloat_String85" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Float" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfFloat_String87" >
-<map  key-type="Float" embedded-key="false" value-type="String">
+<map  key-type="Float" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfFloat_String89" >
-<map  key-type="Float" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfFloat_String89" serialized="true">
+<map  key-type="Float" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfInteger_String90" >
@@ -288,27 +308,29 @@
 </map>
 </field>
 <field name="TreeMapOfInteger_String91" >
-<map  key-type="Integer" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfInteger_String92" >
-<map  key-type="Integer" value-type="String" embedded-value="false">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfInteger_String93" >
-<map  key-type="Integer" embedded-key="true" value-type="String">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfInteger_String94" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Integer" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfInteger_String96" >
-<map  key-type="Integer" embedded-key="false" value-type="String">
+<map  key-type="Integer" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfInteger_String98" >
-<map  key-type="Integer" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfInteger_String98" serialized="true">
+<map  key-type="Integer" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfLong_String99" >
@@ -316,27 +338,29 @@
 </map>
 </field>
 <field name="TreeMapOfLong_String100" >
-<map  key-type="Long" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfLong_String101" >
-<map  key-type="Long" value-type="String" embedded-value="false">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfLong_String102" >
-<map  key-type="Long" embedded-key="true" value-type="String">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfLong_String103" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Long" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfLong_String105" >
-<map  key-type="Long" embedded-key="false" value-type="String">
+<map  key-type="Long" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfLong_String107" >
-<map  key-type="Long" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfLong_String107" serialized="true">
+<map  key-type="Long" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfShort_String108" >
@@ -344,27 +368,29 @@
 </map>
 </field>
 <field name="TreeMapOfShort_String109" >
-<map  key-type="Short" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfShort_String110" >
-<map  key-type="Short" value-type="String" embedded-value="false">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfShort_String111" >
-<map  key-type="Short" embedded-key="true" value-type="String">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 <field name="TreeMapOfShort_String112" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
+<map  key-type="Short" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfShort_String114" >
-<map  key-type="Short" embedded-key="false" value-type="String">
+<map  key-type="Short" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfShort_String116" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="false">
+<field name="TreeMapOfShort_String116" serialized="true">
+<map  key-type="Short" value-type="String">
 </map>
 </field>
 </class>