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 [5/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/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=201690&r1=201689&r2=201690&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 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="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>
@@ -59,18 +51,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>
@@ -95,18 +79,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>
@@ -131,18 +107,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>
@@ -167,18 +135,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>
@@ -203,18 +163,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>
@@ -239,18 +191,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>
@@ -275,18 +219,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>
@@ -311,18 +247,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>
@@ -347,18 +275,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>
@@ -383,18 +303,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>
@@ -419,18 +331,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>
@@ -455,16 +359,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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.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="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>
@@ -191,10 +187,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>
@@ -203,10 +195,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>
@@ -215,10 +203,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>
@@ -227,10 +211,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>
@@ -239,10 +219,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>
@@ -251,10 +227,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>
@@ -263,10 +235,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>
@@ -275,10 +243,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>
@@ -287,10 +251,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>
@@ -299,10 +259,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>
@@ -311,10 +267,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>
@@ -323,10 +275,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>
@@ -335,18 +283,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>
@@ -355,10 +295,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>
@@ -367,10 +303,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>
@@ -379,10 +311,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>
@@ -391,10 +319,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>
@@ -403,10 +327,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>
@@ -415,10 +335,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>
@@ -427,10 +343,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>
@@ -439,10 +351,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>
@@ -451,10 +359,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>
@@ -463,10 +367,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>
@@ -475,10 +375,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>
@@ -487,20 +383,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/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=201690&r1=201689&r2=201690&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 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="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>
@@ -59,18 +51,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>
@@ -95,18 +79,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>
@@ -131,18 +107,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>
@@ -167,18 +135,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>
@@ -203,18 +163,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>
@@ -239,18 +191,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>
@@ -275,18 +219,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>
@@ -311,18 +247,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>
@@ -347,18 +275,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>
@@ -383,18 +303,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>
@@ -419,18 +331,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>
@@ -455,16 +359,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/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.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="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>
@@ -191,10 +187,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>
@@ -203,10 +195,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>
@@ -215,10 +203,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>
@@ -227,10 +211,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>
@@ -239,10 +219,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>
@@ -251,10 +227,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>
@@ -263,10 +235,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>
@@ -275,10 +243,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>
@@ -287,10 +251,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>
@@ -299,10 +259,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>
@@ -311,10 +267,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>
@@ -323,10 +275,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>
@@ -335,18 +283,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>
@@ -355,10 +295,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>
@@ -367,10 +303,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>
@@ -379,10 +311,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>
@@ -391,10 +319,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>
@@ -403,10 +327,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>
@@ -415,10 +335,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>
@@ -427,10 +343,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>
@@ -439,10 +351,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>
@@ -451,10 +359,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>
@@ -463,10 +367,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>
@@ -475,10 +375,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>
@@ -487,20 +383,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/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=201690&r1=201689&r2=201690&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 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="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>
@@ -59,18 +51,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>
@@ -95,18 +79,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>
@@ -131,18 +107,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>
@@ -167,18 +135,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>
@@ -203,18 +163,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>
@@ -239,18 +191,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>
@@ -275,18 +219,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>
@@ -311,18 +247,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>
@@ -347,18 +275,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>
@@ -383,18 +303,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>
@@ -419,18 +331,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>
@@ -455,16 +359,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/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm Fri Jun 24 16:08:27 2005
@@ -128,12 +128,6 @@
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Object44" table="HASHMAP_STR_OBJECT44">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfString_SimpleClass45" table="HASHMAP_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -146,12 +140,6 @@
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleClass47" table="HASHMAP_STR_SIMPLE_CLASS47">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfString_SimpleInterface48" table="HASHMAP_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -164,90 +152,56 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface50" table="HASHMAP_STR_SIMPLE_INTERFACE50">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfString_String51" column="HASHMAP_STR_STRING51">
             </field>
             <field name="HashMapOfString_String52" column="HASHMAP_STR_STRING52">
             </field>
-            <field name="HashMapOfString_String53" column="HASHMAP_STR_STRING53">
-            </field>
             <field name="HashMapOfString_Date54" column="HASHMAP_STR_DATE54">
             </field>
             <field name="HashMapOfString_Date55" column="HASHMAP_STR_DATE55">
             </field>
-            <field name="HashMapOfString_Date56" column="HASHMAP_STR_DATE56">
-            </field>
             <field name="HashMapOfString_Locale57" column="HASHMAP_STR_LOCALE57">
             </field>
             <field name="HashMapOfString_Locale58" column="HASHMAP_STR_LOCALE58">
             </field>
-            <field name="HashMapOfString_Locale59" column="HASHMAP_STR_LOCALE59">
-            </field>
             <field name="HashMapOfString_BigDecimal60" column="HASHMAP_STR_BIG_DECIMAL60">
             </field>
             <field name="HashMapOfString_BigDecimal61" column="HASHMAP_STR_BIG_DECIMAL61">
             </field>
-            <field name="HashMapOfString_BigDecimal62" column="HASHMAP_STR_BIG_DECIMAL62">
-            </field>
             <field name="HashMapOfString_BigInteger63" column="HASHMAP_STR_BIG_INTEGER63">
             </field>
             <field name="HashMapOfString_BigInteger64" column="HASHMAP_STR_BIG_INTEGER64">
             </field>
-            <field name="HashMapOfString_BigInteger65" column="HASHMAP_STR_BIG_INTEGER65">
-            </field>
             <field name="HashMapOfString_Byte66" column="HASHMAP_STR_BYTE66">
             </field>
             <field name="HashMapOfString_Byte67" column="HASHMAP_STR_BYTE67">
             </field>
-            <field name="HashMapOfString_Byte68" column="HASHMAP_STR_BYTE68">
-            </field>
             <field name="HashMapOfString_Double69" column="HASHMAP_STR_DOUBLE69">
             </field>
             <field name="HashMapOfString_Double70" column="HASHMAP_STR_DOUBLE70">
             </field>
-            <field name="HashMapOfString_Double71" column="HASHMAP_STR_DOUBLE71">
-            </field>
             <field name="HashMapOfString_Float72" column="HASHMAP_STR_FLOAT72">
             </field>
             <field name="HashMapOfString_Float73" column="HASHMAP_STR_FLOAT73">
             </field>
-            <field name="HashMapOfString_Float74" column="HASHMAP_STR_FLOAT74">
-            </field>
             <field name="HashMapOfString_Integer75" column="HASHMAP_STR_INTEGER75">
             </field>
             <field name="HashMapOfString_Integer76" column="HASHMAP_STR_INTEGER76">
             </field>
-            <field name="HashMapOfString_Integer77" column="HASHMAP_STR_INTEGER77">
-            </field>
             <field name="HashMapOfString_Long78" column="HASHMAP_STR_LONG78">
             </field>
             <field name="HashMapOfString_Long79" column="HASHMAP_STR_LONG79">
             </field>
-            <field name="HashMapOfString_Long80" column="HASHMAP_STR_LONG80">
-            </field>
             <field name="HashMapOfString_Short81" column="HASHMAP_STR_SHORT81">
             </field>
             <field name="HashMapOfString_Short82" column="HASHMAP_STR_SHORT82">
             </field>
-            <field name="HashMapOfString_Short83" column="HASHMAP_STR_SHORT83">
-            </field>
             <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_Object85" table="HASHMAP_STR_OBJECT85">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfString_Object86" table="HASHMAP_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -260,12 +214,6 @@
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleClass88" table="HASHMAP_STR_SIMPLE_CLASS88">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfString_SimpleClass89" table="HASHMAP_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -278,12 +226,6 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfString_SimpleInterface91" table="HASHMAP_STR_SIMPLE_INTERFACE91">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfString_SimpleInterface92" table="HASHMAP_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -292,8 +234,6 @@
             </field>
             <field name="HashMapOfString_String93" column="HASHMAP_STR_STRING93">
             </field>
-            <field name="HashMapOfString_String94" column="HASHMAP_STR_STRING94">
-            </field>
             <field name="HashMapOfString_String95" table="HASHMAP_STR_STRING95">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -302,8 +242,6 @@
             </field>
             <field name="HashMapOfString_Date96" column="HASHMAP_STR_DATE96">
             </field>
-            <field name="HashMapOfString_Date97" column="HASHMAP_STR_DATE97">
-            </field>
             <field name="HashMapOfString_Date98" table="HASHMAP_STR_DATE98">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -312,8 +250,6 @@
             </field>
             <field name="HashMapOfString_Locale99" column="HASHMAP_STR_LOCALE99">
             </field>
-            <field name="HashMapOfString_Locale100" column="HASHMAP_STR_LOCALE100">
-            </field>
             <field name="HashMapOfString_Locale101" table="HASHMAP_STR_LOCALE101">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -322,8 +258,6 @@
             </field>
             <field name="HashMapOfString_BigDecimal102" column="HASHMAP_STR_BIG_DECIMAL102">
             </field>
-            <field name="HashMapOfString_BigDecimal103" column="HASHMAP_STR_BIG_DECIMAL103">
-            </field>
             <field name="HashMapOfString_BigDecimal104" table="HASHMAP_STR_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -332,8 +266,6 @@
             </field>
             <field name="HashMapOfString_BigInteger105" column="HASHMAP_STR_BIG_INTEGER105">
             </field>
-            <field name="HashMapOfString_BigInteger106" column="HASHMAP_STR_BIG_INTEGER106">
-            </field>
             <field name="HashMapOfString_BigInteger107" table="HASHMAP_STR_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -342,8 +274,6 @@
             </field>
             <field name="HashMapOfString_Byte108" column="HASHMAP_STR_BYTE108">
             </field>
-            <field name="HashMapOfString_Byte109" column="HASHMAP_STR_BYTE109">
-            </field>
             <field name="HashMapOfString_Byte110" table="HASHMAP_STR_BYTE110">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -352,8 +282,6 @@
             </field>
             <field name="HashMapOfString_Double111" column="HASHMAP_STR_DOUBLE111">
             </field>
-            <field name="HashMapOfString_Double112" column="HASHMAP_STR_DOUBLE112">
-            </field>
             <field name="HashMapOfString_Double113" table="HASHMAP_STR_DOUBLE113">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -362,8 +290,6 @@
             </field>
             <field name="HashMapOfString_Float114" column="HASHMAP_STR_FLOAT114">
             </field>
-            <field name="HashMapOfString_Float115" column="HASHMAP_STR_FLOAT115">
-            </field>
             <field name="HashMapOfString_Float116" table="HASHMAP_STR_FLOAT116">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -372,8 +298,6 @@
             </field>
             <field name="HashMapOfString_Integer117" column="HASHMAP_STR_INTEGER117">
             </field>
-            <field name="HashMapOfString_Integer118" column="HASHMAP_STR_INTEGER118">
-            </field>
             <field name="HashMapOfString_Integer119" table="HASHMAP_STR_INTEGER119">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -382,8 +306,6 @@
             </field>
             <field name="HashMapOfString_Long120" column="HASHMAP_STR_LONG120">
             </field>
-            <field name="HashMapOfString_Long121" column="HASHMAP_STR_LONG121">
-            </field>
             <field name="HashMapOfString_Long122" table="HASHMAP_STR_LONG122">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -391,8 +313,6 @@
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfString_Short123" column="HASHMAP_STR_SHORT123">
-            </field>
-            <field name="HashMapOfString_Short124" column="HASHMAP_STR_SHORT124">
             </field>
             <field name="HashMapOfString_Short125" table="HASHMAP_STR_SHORT125">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Fri Jun 24 16:08:27 2005
@@ -34,24 +34,12 @@
                 <value column="STRING"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfObject_String5" table="HASHMAP_OBJECT5_STR">
-                <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key column="OBJREF"/>
                 <value column="STRING"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfObject_String7" table="HASHMAP_OBJECT7_STR">
-                <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfObject_String8" table="HASHMAP_OBJECT8_STR">
                 <join column="IDENTIFIER"/>
                 <key column="OBJREF"/>
@@ -88,24 +76,12 @@
                 <value column="STRING"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfSimpleClass_String14" table="HASHMAP_SIMPLE_CLASS14_STR">
-                <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfSimpleClass_String15" table="HASHMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
                 <value column="STRING"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfSimpleClass_String16" table="HASHMAP_SIMPLE_CLASS16_STR">
-                <join column="IDENTIFIER"/>
-                <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfSimpleClass_String17" table="HASHMAP_SIMPLE_CLASS17_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
@@ -142,24 +118,12 @@
                 <value column="STRING"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfSimpleInterface_String23" table="HASHMAP_SIMPLE_INTERFACE23_STR">
-                <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfSimpleInterface_String24" table="HASHMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
                 <value column="STRING"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashMapOfSimpleInterface_String25" table="HASHMAP_SIMPLE_INTERFACE25_STR">
-                <join column="IDENTIFIER"/>
-                <key column="SIMPINTREF"/>
-                <value column="STRING"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashMapOfSimpleInterface_String26" table="HASHMAP_SIMPLE_INTERFACE26_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
@@ -176,12 +140,8 @@
             </field>
             <field name="HashMapOfString_String31" column="HASHMAP_STRING31_STR">
             </field>
-            <field name="HashMapOfString_String32" column="HASHMAP_STRING32_STR">
-            </field>
             <field name="HashMapOfString_String33" column="HASHMAP_STRING33_STR">
             </field>
-            <field name="HashMapOfString_String34" column="HASHMAP_STRING34_STR">
-            </field>
             <field name="HashMapOfString_String35" table="HASHMAP_STRING35_STR">
                 <join column="IDENTIFIER"/>
                 <key column="STRINGVAL"/>
@@ -198,12 +158,8 @@
             </field>
             <field name="HashMapOfDate_String40" column="HASHMAP_DATE40_STR">
             </field>
-            <field name="HashMapOfDate_String41" column="HASHMAP_DATE41_STR">
-            </field>
             <field name="HashMapOfDate_String42" column="HASHMAP_DATE42_STR">
             </field>
-            <field name="HashMapOfDate_String43" column="HASHMAP_DATE43_STR">
-            </field>
             <field name="HashMapOfDate_String44" table="HASHMAP_DATE44_STR">
                 <join column="IDENTIFIER"/>
                 <key column="DATEVAL"/>
@@ -220,12 +176,8 @@
             </field>
             <field name="HashMapOfBigDecimal_String49" column="HASHMAP_BIG_DECIMAL49_STR">
             </field>
-            <field name="HashMapOfBigDecimal_String50" column="HASHMAP_BIG_DECIMAL50_STR">
-            </field>
             <field name="HashMapOfBigDecimal_String51" column="HASHMAP_BIG_DECIMAL51_STR">
             </field>
-            <field name="HashMapOfBigDecimal_String52" column="HASHMAP_BIG_DECIMAL52_STR">
-            </field>
             <field name="HashMapOfBigDecimal_String53" table="HASHMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <key>
@@ -247,12 +199,8 @@
             </field>
             <field name="HashMapOfBigInteger_String58" column="HASHMAP_BIG_INTEGER58_STR">
             </field>
-            <field name="HashMapOfBigInteger_String59" column="HASHMAP_BIG_INTEGER59_STR">
-            </field>
             <field name="HashMapOfBigInteger_String60" column="HASHMAP_BIG_INTEGER60_STR">
             </field>
-            <field name="HashMapOfBigInteger_String61" column="HASHMAP_BIG_INTEGER61_STR">
-            </field>
             <field name="HashMapOfBigInteger_String62" table="HASHMAP_BIG_INTEGER62_STR">
                 <join column="IDENTIFIER"/>
                 <key column="BIG_INTEGERVAL"/>
@@ -269,12 +217,8 @@
             </field>
             <field name="HashMapOfByte_String67" column="HASHMAP_BYTE67_STR">
             </field>
-            <field name="HashMapOfByte_String68" column="HASHMAP_BYTE68_STR">
-            </field>
             <field name="HashMapOfByte_String69" column="HASHMAP_BYTE69_STR">
             </field>
-            <field name="HashMapOfByte_String70" column="HASHMAP_BYTE70_STR">
-            </field>
             <field name="HashMapOfByte_String71" table="HASHMAP_BYTE71_STR">
                 <join column="IDENTIFIER"/>
                 <key column="BYTEVAL"/>
@@ -291,12 +235,8 @@
             </field>
             <field name="HashMapOfDouble_String76" column="HASHMAP_DOUBLE76_STR">
             </field>
-            <field name="HashMapOfDouble_String77" column="HASHMAP_DOUBLE77_STR">
-            </field>
             <field name="HashMapOfDouble_String78" column="HASHMAP_DOUBLE78_STR">
             </field>
-            <field name="HashMapOfDouble_String79" column="HASHMAP_DOUBLE79_STR">
-            </field>
             <field name="HashMapOfDouble_String80" table="HASHMAP_DOUBLE80_STR">
                 <join column="IDENTIFIER"/>
                 <key column="DOUBLEVAL"/>
@@ -313,12 +253,8 @@
             </field>
             <field name="HashMapOfFloat_String85" column="HASHMAP_FLOAT85_STR">
             </field>
-            <field name="HashMapOfFloat_String86" column="HASHMAP_FLOAT86_STR">
-            </field>
             <field name="HashMapOfFloat_String87" column="HASHMAP_FLOAT87_STR">
             </field>
-            <field name="HashMapOfFloat_String88" column="HASHMAP_FLOAT88_STR">
-            </field>
             <field name="HashMapOfFloat_String89" table="HASHMAP_FLOAT89_STR">
                 <join column="IDENTIFIER"/>
                 <key column="FLOATVAL"/>
@@ -335,12 +271,8 @@
             </field>
             <field name="HashMapOfInteger_String94" column="HASHMAP_INTEGER94_STR">
             </field>
-            <field name="HashMapOfInteger_String95" column="HASHMAP_INTEGER95_STR">
-            </field>
             <field name="HashMapOfInteger_String96" column="HASHMAP_INTEGER96_STR">
             </field>
-            <field name="HashMapOfInteger_String97" column="HASHMAP_INTEGER97_STR">
-            </field>
             <field name="HashMapOfInteger_String98" table="HASHMAP_INTEGER98_STR">
                 <join column="IDENTIFIER"/>
                 <key column="INTEGERVAL"/>
@@ -357,12 +289,8 @@
             </field>
             <field name="HashMapOfLong_String103" column="HASHMAP_LONG103_STR">
             </field>
-            <field name="HashMapOfLong_String104" column="HASHMAP_LONG104_STR">
-            </field>
             <field name="HashMapOfLong_String105" column="HASHMAP_LONG105_STR">
             </field>
-            <field name="HashMapOfLong_String106" column="HASHMAP_LONG106_STR">
-            </field>
             <field name="HashMapOfLong_String107" table="HASHMAP_LONG107_STR">
                 <join column="IDENTIFIER"/>
                 <key column="LONGVAL"/>
@@ -379,11 +307,7 @@
             </field>
             <field name="HashMapOfShort_String112" column="HASHMAP_SHORT112_STR">
             </field>
-            <field name="HashMapOfShort_String113" column="HASHMAP_SHORT113_STR">
-            </field>
             <field name="HashMapOfShort_String114" column="HASHMAP_SHORT114_STR">
-            </field>
-            <field name="HashMapOfShort_String115" column="HASHMAP_SHORT115_STR">
             </field>
             <field name="HashMapOfShort_String116" table="HASHMAP_SHORT116_STR">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=201690&r1=201689&r2=201690&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm Fri Jun 24 16:08:27 2005
@@ -128,12 +128,6 @@
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Object44" table="HASHTBL_OF_STR_OBJECT44">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashtableOfString_SimpleClass45" table="HASHTBL_OF_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -146,12 +140,6 @@
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass47" table="HASHTBL_OF_STR_SIMPLE_CLASS47">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashtableOfString_SimpleInterface48" table="HASHTBL_OF_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -164,90 +152,56 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface50" table="HASHTBL_OF_STR_SIMPLE_INTERFACE50">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashtableOfString_String51" column="HASHTBL_STR_STRING51">
             </field>
             <field name="HashtableOfString_String52" column="HASHTBL_STR_STRING52">
             </field>
-            <field name="HashtableOfString_String53" column="HASHTBL_STR_STRING53">
-            </field>
             <field name="HashtableOfString_Date54" column="HASHTBL_STR_DATE54">
             </field>
             <field name="HashtableOfString_Date55" column="HASHTBL_STR_DATE55">
             </field>
-            <field name="HashtableOfString_Date56" column="HASHTBL_STR_DATE56">
-            </field>
             <field name="HashtableOfString_Locale57" column="HASHTBL_STR_LOCALE57">
             </field>
             <field name="HashtableOfString_Locale58" column="HASHTBL_STR_LOCALE58">
             </field>
-            <field name="HashtableOfString_Locale59" column="HASHTBL_STR_LOCALE59">
-            </field>
             <field name="HashtableOfString_BigDecimal60" column="HASHTBL_STR_BIG_DECIMAL60">
             </field>
             <field name="HashtableOfString_BigDecimal61" column="HASHTBL_STR_BIG_DECIMAL61">
             </field>
-            <field name="HashtableOfString_BigDecimal62" column="HASHTBL_STR_BIG_DECIMAL62">
-            </field>
             <field name="HashtableOfString_BigInteger63" column="HASHTBL_STR_BIG_INTEGER63">
             </field>
             <field name="HashtableOfString_BigInteger64" column="HASHTBL_STR_BIG_INTEGER64">
             </field>
-            <field name="HashtableOfString_BigInteger65" column="HASHTBL_STR_BIG_INTEGER65">
-            </field>
             <field name="HashtableOfString_Byte66" column="HASHTBL_STR_BYTE66">
             </field>
             <field name="HashtableOfString_Byte67" column="HASHTBL_STR_BYTE67">
             </field>
-            <field name="HashtableOfString_Byte68" column="HASHTBL_STR_BYTE68">
-            </field>
             <field name="HashtableOfString_Double69" column="HASHTBL_STR_DOUBLE69">
             </field>
             <field name="HashtableOfString_Double70" column="HASHTBL_STR_DOUBLE70">
             </field>
-            <field name="HashtableOfString_Double71" column="HASHTBL_STR_DOUBLE71">
-            </field>
             <field name="HashtableOfString_Float72" column="HASHTBL_STR_FLOAT72">
             </field>
             <field name="HashtableOfString_Float73" column="HASHTBL_STR_FLOAT73">
             </field>
-            <field name="HashtableOfString_Float74" column="HASHTBL_STR_FLOAT74">
-            </field>
             <field name="HashtableOfString_Integer75" column="HASHTBL_STR_INTEGER75">
             </field>
             <field name="HashtableOfString_Integer76" column="HASHTBL_STR_INTEGER76">
             </field>
-            <field name="HashtableOfString_Integer77" column="HASHTBL_STR_INTEGER77">
-            </field>
             <field name="HashtableOfString_Long78" column="HASHTBL_STR_LONG78">
             </field>
             <field name="HashtableOfString_Long79" column="HASHTBL_STR_LONG79">
             </field>
-            <field name="HashtableOfString_Long80" column="HASHTBL_STR_LONG80">
-            </field>
             <field name="HashtableOfString_Short81" column="HASHTBL_STR_SHORT81">
             </field>
             <field name="HashtableOfString_Short82" column="HASHTBL_STR_SHORT82">
             </field>
-            <field name="HashtableOfString_Short83" column="HASHTBL_STR_SHORT83">
-            </field>
             <field name="HashtableOfString_Object84" table="HASHTBL_OF_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_Object85" table="HASHTBL_OF_STR_OBJECT85">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashtableOfString_Object86" table="HASHTBL_OF_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -260,12 +214,6 @@
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleClass88" table="HASHTBL_OF_STR_SIMPLE_CLASS88">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashtableOfString_SimpleClass89" table="HASHTBL_OF_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -278,12 +226,6 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="HashtableOfString_SimpleInterface91" table="HASHTBL_OF_STR_SIMPLE_INTERFACE91">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
             <field name="HashtableOfString_SimpleInterface92" table="HASHTBL_OF_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -292,8 +234,6 @@
             </field>
             <field name="HashtableOfString_String93" column="HASHTBL_STR_STRING93">
             </field>
-            <field name="HashtableOfString_String94" column="HASHTBL_STR_STRING94">
-            </field>
             <field name="HashtableOfString_String95" table="HASHTBL_OF_STR_STRING95">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -302,8 +242,6 @@
             </field>
             <field name="HashtableOfString_Date96" column="HASHTBL_STR_DATE96">
             </field>
-            <field name="HashtableOfString_Date97" column="HASHTBL_STR_DATE97">
-            </field>
             <field name="HashtableOfString_Date98" table="HASHTBL_OF_STR_DATE98">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -312,8 +250,6 @@
             </field>
             <field name="HashtableOfString_Locale99" column="HASHTBL_STR_LOCALE99">
             </field>
-            <field name="HashtableOfString_Locale100" column="HASHTBL_STR_LOCALE100">
-            </field>
             <field name="HashtableOfString_Locale101" table="HASHTBL_OF_STR_LOCALE101">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -322,8 +258,6 @@
             </field>
             <field name="HashtableOfString_BigDecimal102" column="HASHTBL_STR_BIG_DECIMAL102">
             </field>
-            <field name="HashtableOfString_BigDecimal103" column="HASHTBL_STR_BIG_DECIMAL103">
-            </field>
             <field name="HashtableOfString_BigDecimal104" table="HASHTBL_OF_STR_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -332,8 +266,6 @@
             </field>
             <field name="HashtableOfString_BigInteger105" column="HASHTBL_STR_BIG_INTEGER105">
             </field>
-            <field name="HashtableOfString_BigInteger106" column="HASHTBL_STR_BIG_INTEGER106">
-            </field>
             <field name="HashtableOfString_BigInteger107" table="HASHTBL_OF_STR_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -342,8 +274,6 @@
             </field>
             <field name="HashtableOfString_Byte108" column="HASHTBL_STR_BYTE108">
             </field>
-            <field name="HashtableOfString_Byte109" column="HASHTBL_STR_BYTE109">
-            </field>
             <field name="HashtableOfString_Byte110" table="HASHTBL_OF_STR_BYTE110">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -352,8 +282,6 @@
             </field>
             <field name="HashtableOfString_Double111" column="HASHTBL_STR_DOUBLE111">
             </field>
-            <field name="HashtableOfString_Double112" column="HASHTBL_STR_DOUBLE112">
-            </field>
             <field name="HashtableOfString_Double113" table="HASHTBL_OF_STR_DOUBLE113">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -362,8 +290,6 @@
             </field>
             <field name="HashtableOfString_Float114" column="HASHTBL_STR_FLOAT114">
             </field>
-            <field name="HashtableOfString_Float115" column="HASHTBL_STR_FLOAT115">
-            </field>
             <field name="HashtableOfString_Float116" table="HASHTBL_OF_STR_FLOAT116">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -372,8 +298,6 @@
             </field>
             <field name="HashtableOfString_Integer117" column="HASHTBL_STR_INTEGER117">
             </field>
-            <field name="HashtableOfString_Integer118" column="HASHTBL_STR_INTEGER118">
-            </field>
             <field name="HashtableOfString_Integer119" table="HASHTBL_OF_STR_INTEGER119">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -382,8 +306,6 @@
             </field>
             <field name="HashtableOfString_Long120" column="HASHTBL_STR_LONG120">
             </field>
-            <field name="HashtableOfString_Long121" column="HASHTBL_STR_LONG121">
-            </field>
             <field name="HashtableOfString_Long122" table="HASHTBL_OF_STR_LONG122">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>
@@ -391,8 +313,6 @@
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfString_Short123" column="HASHTBL_STR_SHORT123">
-            </field>
-            <field name="HashtableOfString_Short124" column="HASHTBL_STR_SHORT124">
             </field>
             <field name="HashtableOfString_Short125" table="HASHTBL_OF_STR_SHORT125">
                 <join column="IDENTIFIER"/>



Mime
View raw message