db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r345289 - in /incubator/jdo/trunk/tck20/test: jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
Date Thu, 17 Nov 2005 17:35:10 GMT
Author: mcaisse
Date: Thu Nov 17 09:35:03 2005
New Revision: 345289

URL: http://svn.apache.org/viewcvs?rev=345289&view=rev
Log:
JDO-211 various metadata fixes for *MapStringValueCollections

Modified:
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo?rev=345289&r1=345288&r2=345289&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
Thu Nov 17 09:35:03 2005
@@ -15,7 +15,7 @@
 </field>
 <field name="HashMapOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfObject_String3" >
@@ -28,7 +28,8 @@
 </map>
 </field>
 <field name="HashMapOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfObject_String8" serialized="true">
@@ -45,7 +46,7 @@
 </field>
 <field name="HashMapOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String12" >
@@ -58,7 +59,8 @@
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String17" serialized="true">
@@ -75,7 +77,7 @@
 </field>
 <field name="HashMapOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String21" >
@@ -88,7 +90,8 @@
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -15,7 +15,7 @@
 </field>
 <field name="HashtableOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfObject_String3" >
@@ -28,7 +28,8 @@
 </map>
 </field>
 <field name="HashtableOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfObject_String8" serialized="true">
@@ -45,7 +46,7 @@
 </field>
 <field name="HashtableOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String12" >
@@ -58,7 +59,8 @@
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String17" serialized="true">
@@ -75,7 +77,7 @@
 </field>
 <field name="HashtableOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String21" >
@@ -88,7 +90,8 @@
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -15,7 +15,7 @@
 </field>
 <field name="MapOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="MapOfObject_String3" >
@@ -28,7 +28,8 @@
 </map>
 </field>
 <field name="MapOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfObject_String8" serialized="true">
@@ -45,7 +46,7 @@
 </field>
 <field name="MapOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleClass_String12" >
@@ -58,7 +59,8 @@
 </map>
 </field>
 <field name="MapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleClass_String17" serialized="true">
@@ -75,7 +77,7 @@
 </field>
 <field name="MapOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String21" >
@@ -88,7 +90,8 @@
 </map>
 </field>
 <field name="MapOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -15,7 +15,7 @@
 </field>
 <field name="TreeMapOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfObject_String3" >
@@ -28,7 +28,8 @@
 </map>
 </field>
 <field name="TreeMapOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfObject_String8" serialized="true">
@@ -45,7 +46,7 @@
 </field>
 <field name="TreeMapOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String12" >
@@ -58,7 +59,8 @@
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String17" serialized="true">
@@ -75,7 +77,7 @@
 </field>
 <field name="TreeMapOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String21" >
@@ -88,7 +90,8 @@
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -13,7 +13,7 @@
 </field>
 <field name="HashMapOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfObject_String3" >
@@ -26,7 +26,8 @@
 </map>
 </field>
 <field name="HashMapOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfObject_String8" serialized="true">
@@ -43,7 +44,7 @@
 </field>
 <field name="HashMapOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String12" >
@@ -56,7 +57,8 @@
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleClass_String17" serialized="true">
@@ -73,7 +75,7 @@
 </field>
 <field name="HashMapOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String21" >
@@ -86,7 +88,8 @@
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashMapOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -13,7 +13,7 @@
 </field>
 <field name="HashtableOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfObject_String3" >
@@ -26,7 +26,8 @@
 </map>
 </field>
 <field name="HashtableOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfObject_String8" serialized="true">
@@ -43,7 +44,7 @@
 </field>
 <field name="HashtableOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String12" >
@@ -56,7 +57,8 @@
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleClass_String17" serialized="true">
@@ -73,7 +75,7 @@
 </field>
 <field name="HashtableOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String21" >
@@ -86,7 +88,8 @@
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="HashtableOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -13,7 +13,7 @@
 </field>
 <field name="MapOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="MapOfObject_String3" >
@@ -26,7 +26,8 @@
 </map>
 </field>
 <field name="MapOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfObject_String8" serialized="true">
@@ -43,7 +44,7 @@
 </field>
 <field name="MapOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleClass_String12" >
@@ -56,7 +57,8 @@
 </map>
 </field>
 <field name="MapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleClass_String17" serialized="true">
@@ -73,7 +75,7 @@
 </field>
 <field name="MapOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String21" >
@@ -86,7 +88,8 @@
 </map>
 </field>
 <field name="MapOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="MapOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -13,7 +13,7 @@
 </field>
 <field name="TreeMapOfObject_String2" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfObject_String3" >
@@ -26,7 +26,8 @@
 </map>
 </field>
 <field name="TreeMapOfObject_String6" >
-<map  key-type="SimpleClass" embedded-value="true" value-type="String">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfObject_String8" serialized="true">
@@ -43,7 +44,7 @@
 </field>
 <field name="TreeMapOfSimpleClass_String11" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String12" >
@@ -56,7 +57,8 @@
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String15" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleClass_String17" serialized="true">
@@ -73,7 +75,7 @@
 </field>
 <field name="TreeMapOfSimpleInterface_String20" >
 <map  key-type="SimpleClass" value-type="String"
-      embedded-key="false" embedded-value="false">
+      embedded-key="false" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String21" >
@@ -86,7 +88,8 @@
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String24" >
-<map  key-type="SimpleClass" value-type="String" embedded-value="true">
+<map  key-type="SimpleClass" value-type="String"
+      embedded-key="true" embedded-value="true">
 </map>
 </field>
 <field name="TreeMapOfSimpleInterface_String26" serialized="true">

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=345289&r1=345288&r2=345289&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
Thu Nov 17 09:35:03 2005
@@ -58,13 +58,7 @@
             <field name="HashMapOfSimpleClass_String9"
                    table="HASHMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfSimpleClass_String10"
@@ -82,7 +76,13 @@
             <field name="HashMapOfSimpleClass_String12"
                    table="HASHMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
+                <key>
+                    <embedded>
+                        <field name="id" column="ID"/>
+                        <field name="intField" column="INTVAL"/>
+                        <field name="stringField" column="STRINGVAL"/>
+                    </embedded>
+                </key>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfSimpleClass_String13"

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=345289&r1=345288&r2=345289&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
Thu Nov 17 09:35:03 2005
@@ -128,6 +128,7 @@
             <field name="HashtableOfSimpleInterface_String19"
                    table="HASHTBL_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfSimpleInterface_String20"



Mime
View raw message