db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r201690 [4/7] - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/pc/fieldtypes/ jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/...
Date Fri, 24 Jun 2005 23:08:32 GMT
Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo Fri Jun 24 16:08:27 2005
@@ -25,18 +25,10 @@
 <map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfObject_String5" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfObject_String6" >
 <map  key-type="Object" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfObject_String7" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfObject_String8" >
 <map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -61,18 +53,10 @@
 <map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfSimpleClass_String14" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfSimpleClass_String15" >
 <map  key-type="SimpleClass" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfSimpleClass_String16" >
-<map  key-type="SimpleClass" embedded-key="false" 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">
 </map>
@@ -97,18 +81,10 @@
 <map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfSimpleInterface_String23" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfSimpleInterface_String24" >
 <map  key-type="SimpleInterface" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfSimpleInterface_String25" >
-<map  key-type="SimpleInterface" embedded-key="false" 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">
 </map>
@@ -133,18 +109,10 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_String32" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_String33" >
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfString_String34" >
-<map  key-type="String" embedded-key="false" 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">
 </map>
@@ -169,18 +137,10 @@
 <map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfDate_String41" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfDate_String42" >
 <map  key-type="java.util.Date" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfDate_String43" >
-<map  key-type="java.util.Date" embedded-key="false" 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">
 </map>
@@ -205,18 +165,10 @@
 <map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfBigDecimal_String50" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfBigDecimal_String51" >
 <map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfBigDecimal_String52" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" 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">
 </map>
@@ -241,18 +193,10 @@
 <map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfBigInteger_String59" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfBigInteger_String60" >
 <map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfBigInteger_String61" >
-<map  key-type="java.math.BigInteger" embedded-key="false" 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">
 </map>
@@ -277,18 +221,10 @@
 <map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfByte_String68" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfByte_String69" >
 <map  key-type="Byte" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfByte_String70" >
-<map  key-type="Byte" embedded-key="false" 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">
 </map>
@@ -313,18 +249,10 @@
 <map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfDouble_String77" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfDouble_String78" >
 <map  key-type="Double" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfDouble_String79" >
-<map  key-type="Double" embedded-key="false" 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">
 </map>
@@ -349,18 +277,10 @@
 <map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfFloat_String86" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfFloat_String87" >
 <map  key-type="Float" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfFloat_String88" >
-<map  key-type="Float" embedded-key="false" 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">
 </map>
@@ -385,18 +305,10 @@
 <map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfInteger_String95" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfInteger_String96" >
 <map  key-type="Integer" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfInteger_String97" >
-<map  key-type="Integer" embedded-key="false" 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">
 </map>
@@ -421,18 +333,10 @@
 <map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfLong_String104" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfLong_String105" >
 <map  key-type="Long" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfLong_String106" >
-<map  key-type="Long" embedded-key="false" 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">
 </map>
@@ -457,16 +361,8 @@
 <map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfShort_String113" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfShort_String114" >
 <map  key-type="Short" embedded-key="false" value-type="String">
-</map>
-</field>
-<field name="HashtableOfShort_String115" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfShort_String116" >

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=201690&r1=201689&r2=201690&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 Fri Jun 24 16:08:27 2005
@@ -181,10 +181,6 @@
 <map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Object44" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_SimpleClass45" >
 <map  key-type="String" embedded-key="true" value-type="SimpleClass">
 </map>
@@ -193,10 +189,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_SimpleClass47" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_SimpleInterface48" >
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface">
 </map>
@@ -205,10 +197,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_SimpleInterface50" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_String51" >
 <map  key-type="String" embedded-key="true" value-type="String">
 </map>
@@ -217,10 +205,6 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_String53" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Date54" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Date">
 </map>
@@ -229,10 +213,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Date56" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Locale57" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale">
 </map>
@@ -241,10 +221,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Locale59" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_BigDecimal60" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal">
 </map>
@@ -253,10 +229,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_BigDecimal62" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_BigInteger63" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger">
 </map>
@@ -265,10 +237,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_BigInteger65" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Byte66" >
 <map  key-type="String" embedded-key="true" value-type="Byte">
 </map>
@@ -277,10 +245,6 @@
 <map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Byte68" >
-<map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Double69" >
 <map  key-type="String" embedded-key="true" value-type="Double">
 </map>
@@ -289,10 +253,6 @@
 <map  key-type="String" embedded-key="true" value-type="Double" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Double71" >
-<map  key-type="String" embedded-key="true" value-type="Double" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Float72" >
 <map  key-type="String" embedded-key="true" value-type="Float">
 </map>
@@ -301,10 +261,6 @@
 <map  key-type="String" embedded-key="true" value-type="Float" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Float74" >
-<map  key-type="String" embedded-key="true" value-type="Float" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Integer75" >
 <map  key-type="String" embedded-key="true" value-type="Integer">
 </map>
@@ -313,10 +269,6 @@
 <map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Integer77" >
-<map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Long78" >
 <map  key-type="String" embedded-key="true" value-type="Long">
 </map>
@@ -325,10 +277,6 @@
 <map  key-type="String" embedded-key="true" value-type="Long" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Long80" >
-<map  key-type="String" embedded-key="true" value-type="Long" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Short81" >
 <map  key-type="String" embedded-key="true" value-type="Short">
 </map>
@@ -337,18 +285,10 @@
 <map  key-type="String" embedded-key="true" value-type="Short" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_Short83" >
-<map  key-type="String" embedded-key="true" value-type="Short" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_Object84" >
 <map  key-type="String" embedded-key="false" value-type="Object">
 </map>
 </field>
-<field name="MapOfString_Object85" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Object86" >
 <map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
 </map>
@@ -357,10 +297,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleClass">
 </map>
 </field>
-<field name="MapOfString_SimpleClass88" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_SimpleClass89" >
 <map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
 </map>
@@ -369,10 +305,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface">
 </map>
 </field>
-<field name="MapOfString_SimpleInterface91" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_SimpleInterface92" >
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
 </map>
@@ -381,10 +313,6 @@
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfString_String94" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_String95" >
 <map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -393,10 +321,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Date">
 </map>
 </field>
-<field name="MapOfString_Date97" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Date98" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
 </map>
@@ -405,10 +329,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale">
 </map>
 </field>
-<field name="MapOfString_Locale100" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Locale101" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
 </map>
@@ -417,10 +337,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal">
 </map>
 </field>
-<field name="MapOfString_BigDecimal103" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_BigDecimal104" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
 </map>
@@ -429,10 +345,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger">
 </map>
 </field>
-<field name="MapOfString_BigInteger106" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_BigInteger107" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
 </map>
@@ -441,10 +353,6 @@
 <map  key-type="String" embedded-key="false" value-type="Byte">
 </map>
 </field>
-<field name="MapOfString_Byte109" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Byte110" >
 <map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
 </map>
@@ -453,10 +361,6 @@
 <map  key-type="String" embedded-key="false" value-type="Double">
 </map>
 </field>
-<field name="MapOfString_Double112" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Double113" >
 <map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
 </map>
@@ -465,10 +369,6 @@
 <map  key-type="String" embedded-key="false" value-type="Float">
 </map>
 </field>
-<field name="MapOfString_Float115" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Float116" >
 <map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
 </map>
@@ -477,10 +377,6 @@
 <map  key-type="String" embedded-key="false" value-type="Integer">
 </map>
 </field>
-<field name="MapOfString_Integer118" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Integer119" >
 <map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
 </map>
@@ -489,20 +385,12 @@
 <map  key-type="String" embedded-key="false" value-type="Long">
 </map>
 </field>
-<field name="MapOfString_Long121" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="true">
-</map>
-</field>
 <field name="MapOfString_Long122" >
 <map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
 </map>
 </field>
 <field name="MapOfString_Short123" >
 <map  key-type="String" embedded-key="false" value-type="Short">
-</map>
-</field>
-<field name="MapOfString_Short124" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="true">
 </map>
 </field>
 <field name="MapOfString_Short125" >

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo Fri Jun 24 16:08:27 2005
@@ -25,18 +25,10 @@
 <map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfObject_String5" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfObject_String6" >
 <map  key-type="Object" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfObject_String7" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="MapOfObject_String8" >
 <map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -61,18 +53,10 @@
 <map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfSimpleClass_String14" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfSimpleClass_String15" >
 <map  key-type="SimpleClass" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfSimpleClass_String16" >
-<map  key-type="SimpleClass" embedded-key="false" 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">
 </map>
@@ -97,18 +81,10 @@
 <map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfSimpleInterface_String23" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfSimpleInterface_String24" >
 <map  key-type="SimpleInterface" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfSimpleInterface_String25" >
-<map  key-type="SimpleInterface" embedded-key="false" 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">
 </map>
@@ -133,18 +109,10 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfString_String32" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfString_String33" >
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfString_String34" >
-<map  key-type="String" embedded-key="false" 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">
 </map>
@@ -169,18 +137,10 @@
 <map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfDate_String41" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfDate_String42" >
 <map  key-type="java.util.Date" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfDate_String43" >
-<map  key-type="java.util.Date" embedded-key="false" 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">
 </map>
@@ -205,18 +165,10 @@
 <map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfBigDecimal_String50" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfBigDecimal_String51" >
 <map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfBigDecimal_String52" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" 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">
 </map>
@@ -241,18 +193,10 @@
 <map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfBigInteger_String59" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfBigInteger_String60" >
 <map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfBigInteger_String61" >
-<map  key-type="java.math.BigInteger" embedded-key="false" 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">
 </map>
@@ -277,18 +221,10 @@
 <map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfByte_String68" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfByte_String69" >
 <map  key-type="Byte" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfByte_String70" >
-<map  key-type="Byte" embedded-key="false" 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">
 </map>
@@ -313,18 +249,10 @@
 <map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfDouble_String77" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfDouble_String78" >
 <map  key-type="Double" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfDouble_String79" >
-<map  key-type="Double" embedded-key="false" 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">
 </map>
@@ -349,18 +277,10 @@
 <map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfFloat_String86" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfFloat_String87" >
 <map  key-type="Float" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfFloat_String88" >
-<map  key-type="Float" embedded-key="false" 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">
 </map>
@@ -385,18 +305,10 @@
 <map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfInteger_String95" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfInteger_String96" >
 <map  key-type="Integer" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfInteger_String97" >
-<map  key-type="Integer" embedded-key="false" 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">
 </map>
@@ -421,18 +333,10 @@
 <map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfLong_String104" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfLong_String105" >
 <map  key-type="Long" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="MapOfLong_String106" >
-<map  key-type="Long" embedded-key="false" 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">
 </map>
@@ -457,16 +361,8 @@
 <map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="MapOfShort_String113" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="MapOfShort_String114" >
 <map  key-type="Short" embedded-key="false" value-type="String">
-</map>
-</field>
-<field name="MapOfShort_String115" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="MapOfShort_String116" >

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=201690&r1=201689&r2=201690&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 Fri Jun 24 16:08:27 2005
@@ -181,10 +181,6 @@
 <map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Object44" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_SimpleClass45" >
 <map  key-type="String" embedded-key="true" value-type="SimpleClass">
 </map>
@@ -193,10 +189,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleClass47" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_SimpleInterface48" >
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface">
 </map>
@@ -205,10 +197,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleInterface50" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_String51" >
 <map  key-type="String" embedded-key="true" value-type="String">
 </map>
@@ -217,10 +205,6 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_String53" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Date54" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Date">
 </map>
@@ -229,10 +213,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Date56" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Locale57" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale">
 </map>
@@ -241,10 +221,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Locale59" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_BigDecimal60" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal">
 </map>
@@ -253,10 +229,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_BigDecimal62" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_BigInteger63" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger">
 </map>
@@ -265,10 +237,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_BigInteger65" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Byte66" >
 <map  key-type="String" embedded-key="true" value-type="Byte">
 </map>
@@ -277,10 +245,6 @@
 <map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Byte68" >
-<map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Double69" >
 <map  key-type="String" embedded-key="true" value-type="Double">
 </map>
@@ -289,10 +253,6 @@
 <map  key-type="String" embedded-key="true" value-type="Double" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Double71" >
-<map  key-type="String" embedded-key="true" value-type="Double" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Float72" >
 <map  key-type="String" embedded-key="true" value-type="Float">
 </map>
@@ -301,10 +261,6 @@
 <map  key-type="String" embedded-key="true" value-type="Float" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Float74" >
-<map  key-type="String" embedded-key="true" value-type="Float" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Integer75" >
 <map  key-type="String" embedded-key="true" value-type="Integer">
 </map>
@@ -313,10 +269,6 @@
 <map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Integer77" >
-<map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Long78" >
 <map  key-type="String" embedded-key="true" value-type="Long">
 </map>
@@ -325,10 +277,6 @@
 <map  key-type="String" embedded-key="true" value-type="Long" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Long80" >
-<map  key-type="String" embedded-key="true" value-type="Long" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Short81" >
 <map  key-type="String" embedded-key="true" value-type="Short">
 </map>
@@ -337,18 +285,10 @@
 <map  key-type="String" embedded-key="true" value-type="Short" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_Short83" >
-<map  key-type="String" embedded-key="true" value-type="Short" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_Object84" >
 <map  key-type="String" embedded-key="false" value-type="Object">
 </map>
 </field>
-<field name="TreeMapOfString_Object85" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Object86" >
 <map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
 </map>
@@ -357,10 +297,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleClass">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleClass88" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_SimpleClass89" >
 <map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
 </map>
@@ -369,10 +305,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface">
 </map>
 </field>
-<field name="TreeMapOfString_SimpleInterface91" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_SimpleInterface92" >
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
 </map>
@@ -381,10 +313,6 @@
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfString_String94" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_String95" >
 <map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -393,10 +321,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Date">
 </map>
 </field>
-<field name="TreeMapOfString_Date97" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Date98" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
 </map>
@@ -405,10 +329,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale">
 </map>
 </field>
-<field name="TreeMapOfString_Locale100" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Locale101" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
 </map>
@@ -417,10 +337,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal">
 </map>
 </field>
-<field name="TreeMapOfString_BigDecimal103" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_BigDecimal104" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
 </map>
@@ -429,10 +345,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger">
 </map>
 </field>
-<field name="TreeMapOfString_BigInteger106" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_BigInteger107" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
 </map>
@@ -441,10 +353,6 @@
 <map  key-type="String" embedded-key="false" value-type="Byte">
 </map>
 </field>
-<field name="TreeMapOfString_Byte109" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Byte110" >
 <map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
 </map>
@@ -453,10 +361,6 @@
 <map  key-type="String" embedded-key="false" value-type="Double">
 </map>
 </field>
-<field name="TreeMapOfString_Double112" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Double113" >
 <map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
 </map>
@@ -465,10 +369,6 @@
 <map  key-type="String" embedded-key="false" value-type="Float">
 </map>
 </field>
-<field name="TreeMapOfString_Float115" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Float116" >
 <map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
 </map>
@@ -477,10 +377,6 @@
 <map  key-type="String" embedded-key="false" value-type="Integer">
 </map>
 </field>
-<field name="TreeMapOfString_Integer118" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Integer119" >
 <map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
 </map>
@@ -489,20 +385,12 @@
 <map  key-type="String" embedded-key="false" value-type="Long">
 </map>
 </field>
-<field name="TreeMapOfString_Long121" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfString_Long122" >
 <map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
 </map>
 </field>
 <field name="TreeMapOfString_Short123" >
 <map  key-type="String" embedded-key="false" value-type="Short">
-</map>
-</field>
-<field name="TreeMapOfString_Short124" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfString_Short125" >

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo Fri Jun 24 16:08:27 2005
@@ -25,18 +25,10 @@
 <map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfObject_String5" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfObject_String6" >
 <map  key-type="Object" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfObject_String7" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="TreeMapOfObject_String8" >
 <map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -61,18 +53,10 @@
 <map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfSimpleClass_String14" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfSimpleClass_String15" >
 <map  key-type="SimpleClass" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfSimpleClass_String16" >
-<map  key-type="SimpleClass" embedded-key="false" 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">
 </map>
@@ -97,18 +81,10 @@
 <map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfSimpleInterface_String23" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfSimpleInterface_String24" >
 <map  key-type="SimpleInterface" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfSimpleInterface_String25" >
-<map  key-type="SimpleInterface" embedded-key="false" 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">
 </map>
@@ -133,18 +109,10 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfString_String32" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfString_String33" >
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfString_String34" >
-<map  key-type="String" embedded-key="false" 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">
 </map>
@@ -169,18 +137,10 @@
 <map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfDate_String41" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfDate_String42" >
 <map  key-type="java.util.Date" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfDate_String43" >
-<map  key-type="java.util.Date" embedded-key="false" 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">
 </map>
@@ -205,18 +165,10 @@
 <map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfBigDecimal_String50" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfBigDecimal_String51" >
 <map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfBigDecimal_String52" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" 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">
 </map>
@@ -241,18 +193,10 @@
 <map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfBigInteger_String59" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfBigInteger_String60" >
 <map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfBigInteger_String61" >
-<map  key-type="java.math.BigInteger" embedded-key="false" 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">
 </map>
@@ -277,18 +221,10 @@
 <map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfByte_String68" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfByte_String69" >
 <map  key-type="Byte" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfByte_String70" >
-<map  key-type="Byte" embedded-key="false" 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">
 </map>
@@ -313,18 +249,10 @@
 <map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfDouble_String77" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfDouble_String78" >
 <map  key-type="Double" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfDouble_String79" >
-<map  key-type="Double" embedded-key="false" 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">
 </map>
@@ -349,18 +277,10 @@
 <map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfFloat_String86" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfFloat_String87" >
 <map  key-type="Float" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfFloat_String88" >
-<map  key-type="Float" embedded-key="false" 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">
 </map>
@@ -385,18 +305,10 @@
 <map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfInteger_String95" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfInteger_String96" >
 <map  key-type="Integer" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfInteger_String97" >
-<map  key-type="Integer" embedded-key="false" 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">
 </map>
@@ -421,18 +333,10 @@
 <map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfLong_String104" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfLong_String105" >
 <map  key-type="Long" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="TreeMapOfLong_String106" >
-<map  key-type="Long" embedded-key="false" 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">
 </map>
@@ -457,16 +361,8 @@
 <map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="TreeMapOfShort_String113" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="TreeMapOfShort_String114" >
 <map  key-type="Short" embedded-key="false" value-type="String">
-</map>
-</field>
-<field name="TreeMapOfShort_String115" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfShort_String116" >

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo Fri Jun 24 16:08:27 2005
@@ -179,10 +179,6 @@
 <map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Object44" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_SimpleClass45" >
 <map  key-type="String" embedded-key="true" value-type="SimpleClass">
 </map>
@@ -191,10 +187,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_SimpleClass47" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_SimpleInterface48" >
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface">
 </map>
@@ -203,10 +195,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_SimpleInterface50" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_String51" >
 <map  key-type="String" embedded-key="true" value-type="String">
 </map>
@@ -215,10 +203,6 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_String53" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Date54" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Date">
 </map>
@@ -227,10 +211,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Date56" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Locale57" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale">
 </map>
@@ -239,10 +219,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Locale59" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_BigDecimal60" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal">
 </map>
@@ -251,10 +227,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_BigDecimal62" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_BigInteger63" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger">
 </map>
@@ -263,10 +235,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_BigInteger65" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Byte66" >
 <map  key-type="String" embedded-key="true" value-type="Byte">
 </map>
@@ -275,10 +243,6 @@
 <map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Byte68" >
-<map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Double69" >
 <map  key-type="String" embedded-key="true" value-type="Double">
 </map>
@@ -287,10 +251,6 @@
 <map  key-type="String" embedded-key="true" value-type="Double" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Double71" >
-<map  key-type="String" embedded-key="true" value-type="Double" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Float72" >
 <map  key-type="String" embedded-key="true" value-type="Float">
 </map>
@@ -299,10 +259,6 @@
 <map  key-type="String" embedded-key="true" value-type="Float" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Float74" >
-<map  key-type="String" embedded-key="true" value-type="Float" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Integer75" >
 <map  key-type="String" embedded-key="true" value-type="Integer">
 </map>
@@ -311,10 +267,6 @@
 <map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Integer77" >
-<map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Long78" >
 <map  key-type="String" embedded-key="true" value-type="Long">
 </map>
@@ -323,10 +275,6 @@
 <map  key-type="String" embedded-key="true" value-type="Long" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Long80" >
-<map  key-type="String" embedded-key="true" value-type="Long" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Short81" >
 <map  key-type="String" embedded-key="true" value-type="Short">
 </map>
@@ -335,18 +283,10 @@
 <map  key-type="String" embedded-key="true" value-type="Short" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_Short83" >
-<map  key-type="String" embedded-key="true" value-type="Short" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_Object84" >
 <map  key-type="String" embedded-key="false" value-type="Object">
 </map>
 </field>
-<field name="HashMapOfString_Object85" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Object86" >
 <map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
 </map>
@@ -355,10 +295,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashMapOfString_SimpleClass88" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_SimpleClass89" >
 <map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
 </map>
@@ -367,10 +303,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface">
 </map>
 </field>
-<field name="HashMapOfString_SimpleInterface91" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_SimpleInterface92" >
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
 </map>
@@ -379,10 +311,6 @@
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfString_String94" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_String95" >
 <map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -391,10 +319,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Date">
 </map>
 </field>
-<field name="HashMapOfString_Date97" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Date98" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
 </map>
@@ -403,10 +327,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale">
 </map>
 </field>
-<field name="HashMapOfString_Locale100" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Locale101" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
 </map>
@@ -415,10 +335,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal">
 </map>
 </field>
-<field name="HashMapOfString_BigDecimal103" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_BigDecimal104" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
 </map>
@@ -427,10 +343,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger">
 </map>
 </field>
-<field name="HashMapOfString_BigInteger106" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_BigInteger107" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
 </map>
@@ -439,10 +351,6 @@
 <map  key-type="String" embedded-key="false" value-type="Byte">
 </map>
 </field>
-<field name="HashMapOfString_Byte109" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Byte110" >
 <map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
 </map>
@@ -451,10 +359,6 @@
 <map  key-type="String" embedded-key="false" value-type="Double">
 </map>
 </field>
-<field name="HashMapOfString_Double112" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Double113" >
 <map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
 </map>
@@ -463,10 +367,6 @@
 <map  key-type="String" embedded-key="false" value-type="Float">
 </map>
 </field>
-<field name="HashMapOfString_Float115" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Float116" >
 <map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
 </map>
@@ -475,10 +375,6 @@
 <map  key-type="String" embedded-key="false" value-type="Integer">
 </map>
 </field>
-<field name="HashMapOfString_Integer118" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Integer119" >
 <map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
 </map>
@@ -487,20 +383,12 @@
 <map  key-type="String" embedded-key="false" value-type="Long">
 </map>
 </field>
-<field name="HashMapOfString_Long121" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfString_Long122" >
 <map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
 </map>
 </field>
 <field name="HashMapOfString_Short123" >
 <map  key-type="String" embedded-key="false" value-type="Short">
-</map>
-</field>
-<field name="HashMapOfString_Short124" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfString_Short125" >

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=201690&r1=201689&r2=201690&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 Fri Jun 24 16:08:27 2005
@@ -23,18 +23,10 @@
 <map  key-type="Object" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfObject_String5" >
-<map  key-type="Object" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfObject_String6" >
 <map  key-type="Object" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfObject_String7" >
-<map  key-type="Object" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="HashMapOfObject_String8" >
 <map  key-type="Object" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -59,18 +51,10 @@
 <map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfSimpleClass_String14" >
-<map  key-type="SimpleClass" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfSimpleClass_String15" >
 <map  key-type="SimpleClass" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfSimpleClass_String16" >
-<map  key-type="SimpleClass" embedded-key="false" 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">
 </map>
@@ -95,18 +79,10 @@
 <map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfSimpleInterface_String23" >
-<map  key-type="SimpleInterface" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfSimpleInterface_String24" >
 <map  key-type="SimpleInterface" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfSimpleInterface_String25" >
-<map  key-type="SimpleInterface" embedded-key="false" 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">
 </map>
@@ -131,18 +107,10 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfString_String32" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfString_String33" >
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfString_String34" >
-<map  key-type="String" embedded-key="false" 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">
 </map>
@@ -167,18 +135,10 @@
 <map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfDate_String41" >
-<map  key-type="java.util.Date" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfDate_String42" >
 <map  key-type="java.util.Date" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfDate_String43" >
-<map  key-type="java.util.Date" embedded-key="false" 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">
 </map>
@@ -203,18 +163,10 @@
 <map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfBigDecimal_String50" >
-<map  key-type="java.math.BigDecimal" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfBigDecimal_String51" >
 <map  key-type="java.math.BigDecimal" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfBigDecimal_String52" >
-<map  key-type="java.math.BigDecimal" embedded-key="false" 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">
 </map>
@@ -239,18 +191,10 @@
 <map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfBigInteger_String59" >
-<map  key-type="java.math.BigInteger" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfBigInteger_String60" >
 <map  key-type="java.math.BigInteger" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfBigInteger_String61" >
-<map  key-type="java.math.BigInteger" embedded-key="false" 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">
 </map>
@@ -275,18 +219,10 @@
 <map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfByte_String68" >
-<map  key-type="Byte" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfByte_String69" >
 <map  key-type="Byte" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfByte_String70" >
-<map  key-type="Byte" embedded-key="false" 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">
 </map>
@@ -311,18 +247,10 @@
 <map  key-type="Double" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfDouble_String77" >
-<map  key-type="Double" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfDouble_String78" >
 <map  key-type="Double" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfDouble_String79" >
-<map  key-type="Double" embedded-key="false" 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">
 </map>
@@ -347,18 +275,10 @@
 <map  key-type="Float" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfFloat_String86" >
-<map  key-type="Float" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfFloat_String87" >
 <map  key-type="Float" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfFloat_String88" >
-<map  key-type="Float" embedded-key="false" 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">
 </map>
@@ -383,18 +303,10 @@
 <map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfInteger_String95" >
-<map  key-type="Integer" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfInteger_String96" >
 <map  key-type="Integer" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfInteger_String97" >
-<map  key-type="Integer" embedded-key="false" 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">
 </map>
@@ -419,18 +331,10 @@
 <map  key-type="Long" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfLong_String104" >
-<map  key-type="Long" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfLong_String105" >
 <map  key-type="Long" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashMapOfLong_String106" >
-<map  key-type="Long" embedded-key="false" 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">
 </map>
@@ -455,16 +359,8 @@
 <map  key-type="Short" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashMapOfShort_String113" >
-<map  key-type="Short" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashMapOfShort_String114" >
 <map  key-type="Short" embedded-key="false" value-type="String">
-</map>
-</field>
-<field name="HashMapOfShort_String115" >
-<map  key-type="Short" embedded-key="false" value-type="String" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfShort_String116" >

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo Fri Jun 24 16:08:27 2005
@@ -179,10 +179,6 @@
 <map  key-type="String" embedded-key="true" value-type="Object" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Object44" >
-<map  key-type="String" embedded-key="true" value-type="Object" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_SimpleClass45" >
 <map  key-type="String" embedded-key="true" value-type="SimpleClass">
 </map>
@@ -191,10 +187,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_SimpleClass47" >
-<map  key-type="String" embedded-key="true" value-type="SimpleClass" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_SimpleInterface48" >
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface">
 </map>
@@ -203,10 +195,6 @@
 <map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_SimpleInterface50" >
-<map  key-type="String" embedded-key="true" value-type="SimpleInterface" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_String51" >
 <map  key-type="String" embedded-key="true" value-type="String">
 </map>
@@ -215,10 +203,6 @@
 <map  key-type="String" embedded-key="true" value-type="String" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_String53" >
-<map  key-type="String" embedded-key="true" value-type="String" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Date54" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Date">
 </map>
@@ -227,10 +211,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Date56" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Date" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Locale57" >
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale">
 </map>
@@ -239,10 +219,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Locale59" >
-<map  key-type="String" embedded-key="true" value-type="java.util.Locale" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_BigDecimal60" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal">
 </map>
@@ -251,10 +227,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_BigDecimal62" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigDecimal" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_BigInteger63" >
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger">
 </map>
@@ -263,10 +235,6 @@
 <map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_BigInteger65" >
-<map  key-type="String" embedded-key="true" value-type="java.math.BigInteger" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Byte66" >
 <map  key-type="String" embedded-key="true" value-type="Byte">
 </map>
@@ -275,10 +243,6 @@
 <map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Byte68" >
-<map  key-type="String" embedded-key="true" value-type="Byte" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Double69" >
 <map  key-type="String" embedded-key="true" value-type="Double">
 </map>
@@ -287,10 +251,6 @@
 <map  key-type="String" embedded-key="true" value-type="Double" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Double71" >
-<map  key-type="String" embedded-key="true" value-type="Double" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Float72" >
 <map  key-type="String" embedded-key="true" value-type="Float">
 </map>
@@ -299,10 +259,6 @@
 <map  key-type="String" embedded-key="true" value-type="Float" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Float74" >
-<map  key-type="String" embedded-key="true" value-type="Float" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Integer75" >
 <map  key-type="String" embedded-key="true" value-type="Integer">
 </map>
@@ -311,10 +267,6 @@
 <map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Integer77" >
-<map  key-type="String" embedded-key="true" value-type="Integer" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Long78" >
 <map  key-type="String" embedded-key="true" value-type="Long">
 </map>
@@ -323,10 +275,6 @@
 <map  key-type="String" embedded-key="true" value-type="Long" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Long80" >
-<map  key-type="String" embedded-key="true" value-type="Long" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Short81" >
 <map  key-type="String" embedded-key="true" value-type="Short">
 </map>
@@ -335,18 +283,10 @@
 <map  key-type="String" embedded-key="true" value-type="Short" embedded-value="true">
 </map>
 </field>
-<field name="HashtableOfString_Short83" >
-<map  key-type="String" embedded-key="true" value-type="Short" embedded-value="false">
-</map>
-</field>
 <field name="HashtableOfString_Object84" >
 <map  key-type="String" embedded-key="false" value-type="Object">
 </map>
 </field>
-<field name="HashtableOfString_Object85" >
-<map  key-type="String" embedded-key="false" value-type="Object" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Object86" >
 <map  key-type="String" embedded-key="false" value-type="Object" embedded-value="false">
 </map>
@@ -355,10 +295,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleClass">
 </map>
 </field>
-<field name="HashtableOfString_SimpleClass88" >
-<map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_SimpleClass89" >
 <map  key-type="String" embedded-key="false" value-type="SimpleClass" embedded-value="false">
 </map>
@@ -367,10 +303,6 @@
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface">
 </map>
 </field>
-<field name="HashtableOfString_SimpleInterface91" >
-<map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_SimpleInterface92" >
 <map  key-type="String" embedded-key="false" value-type="SimpleInterface" embedded-value="false">
 </map>
@@ -379,10 +311,6 @@
 <map  key-type="String" embedded-key="false" value-type="String">
 </map>
 </field>
-<field name="HashtableOfString_String94" >
-<map  key-type="String" embedded-key="false" value-type="String" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_String95" >
 <map  key-type="String" embedded-key="false" value-type="String" embedded-value="false">
 </map>
@@ -391,10 +319,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Date">
 </map>
 </field>
-<field name="HashtableOfString_Date97" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Date98" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Date" embedded-value="false">
 </map>
@@ -403,10 +327,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale">
 </map>
 </field>
-<field name="HashtableOfString_Locale100" >
-<map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Locale101" >
 <map  key-type="String" embedded-key="false" value-type="java.util.Locale" embedded-value="false">
 </map>
@@ -415,10 +335,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal">
 </map>
 </field>
-<field name="HashtableOfString_BigDecimal103" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_BigDecimal104" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigDecimal" embedded-value="false">
 </map>
@@ -427,10 +343,6 @@
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger">
 </map>
 </field>
-<field name="HashtableOfString_BigInteger106" >
-<map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_BigInteger107" >
 <map  key-type="String" embedded-key="false" value-type="java.math.BigInteger" embedded-value="false">
 </map>
@@ -439,10 +351,6 @@
 <map  key-type="String" embedded-key="false" value-type="Byte">
 </map>
 </field>
-<field name="HashtableOfString_Byte109" >
-<map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Byte110" >
 <map  key-type="String" embedded-key="false" value-type="Byte" embedded-value="false">
 </map>
@@ -451,10 +359,6 @@
 <map  key-type="String" embedded-key="false" value-type="Double">
 </map>
 </field>
-<field name="HashtableOfString_Double112" >
-<map  key-type="String" embedded-key="false" value-type="Double" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Double113" >
 <map  key-type="String" embedded-key="false" value-type="Double" embedded-value="false">
 </map>
@@ -463,10 +367,6 @@
 <map  key-type="String" embedded-key="false" value-type="Float">
 </map>
 </field>
-<field name="HashtableOfString_Float115" >
-<map  key-type="String" embedded-key="false" value-type="Float" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Float116" >
 <map  key-type="String" embedded-key="false" value-type="Float" embedded-value="false">
 </map>
@@ -475,10 +375,6 @@
 <map  key-type="String" embedded-key="false" value-type="Integer">
 </map>
 </field>
-<field name="HashtableOfString_Integer118" >
-<map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Integer119" >
 <map  key-type="String" embedded-key="false" value-type="Integer" embedded-value="false">
 </map>
@@ -487,20 +383,12 @@
 <map  key-type="String" embedded-key="false" value-type="Long">
 </map>
 </field>
-<field name="HashtableOfString_Long121" >
-<map  key-type="String" embedded-key="false" value-type="Long" embedded-value="true">
-</map>
-</field>
 <field name="HashtableOfString_Long122" >
 <map  key-type="String" embedded-key="false" value-type="Long" embedded-value="false">
 </map>
 </field>
 <field name="HashtableOfString_Short123" >
 <map  key-type="String" embedded-key="false" value-type="Short">
-</map>
-</field>
-<field name="HashtableOfString_Short124" >
-<map  key-type="String" embedded-key="false" value-type="Short" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfString_Short125" >



Mime
View raw message