db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r188795 [2/3] - in /incubator/jdo/trunk/tck20/test: jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/ orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ orm/datastoreidentity/org/apache/jdo/tck/pc/company/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/ sql/derby/
Date Tue, 07 Jun 2005 15:16:08 GMT
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="long0" column="LONG0"/>
             <field name="long1" column="LONG1"/>
             <field name="long102" column="LONG102"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="short0" column="SHORT0"/>
             <field name="short1" column="SHORT1"/>
             <field name="short102" column="SHORT102"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Short0" column="SHORT0"/>
             <field name="Short1" column="SHORT1"/>
             <field name="Short102" column="SHORT102"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="SimpleClass0"  column="SIMPLECLASS0">
             </field>
             <field name="SimpleClass1"  column="SIMPLECLASS1">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="SimpleInterface1" column="SIMPLEINTERFACE1"/>
             <field name="SimpleInterface102" column="SIMPLEINTERFACE102"/>
             <field name="SimpleInterface103" column="SIMPLEINTERFACE103"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="String0" column="STRING0"/>
             <field name="String1" column="STRING1"/>
             <field name="String102" column="STRING102"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections" table="HASHMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections" table="HASHMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashSetOfObject0" table="HASHSET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections" table="HASHTABLESTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashtableOfString_Object0" table="HASHTBL_OF_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections" table="HASHTBLSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashtableOfObject_String0" table="HASHTBL_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="LinkedListOfObject0" table="LINKEDLIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="ListOfObject0" table="LIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections" table="MAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfObject_String0" table="MAP_OF_OBJECT0_STRING">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="SetOfObject0" table="SET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
Tue Jun  7 08:16:04 2005
@@ -4,7 +4,8 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <implements name="SimpleInterface"/>
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="id" column="IDENTIFIER"/>
             <field name="intField" column="INTVAL"/>
             <field name="stringField" column="STRINGVAL"/>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections" table="TREEMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfString_Object0" table="TREEMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections" table="TREEMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeSetOfObject0" table="TREESET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,7 +3,8 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
-            <datastore-identity strategy="identity" column="IDENTIFIER"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="VectorOfObject0" table="VECTOR_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
Tue Jun  7 08:16:04 2005
@@ -3,12 +3,13 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
-            <datastore-identity strategy="identity" column="KEY_VALUE"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
             <field name="intB" column="INT_B"/>
             <field name="doubleB" column="DOUBLE_B"/>
+            <field name="keyValue" column="KEY_VALUE"/>
         </class>
 
         <class name="AllPersist2">
@@ -29,10 +30,11 @@
         </class>
 
         <class name="TopNonPersistB" table="TopNonPersistB">
-            <datastore-identity strategy="identity" column="KEY_VALUE"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
+            <field name="keyValue" column="KEY_VALUE"/>
             <field name="doubleB" column="DOUBLE_B"/>
             <field name="intB" column="INT_B"/>
         </class>
@@ -55,12 +57,13 @@
         </class>
 
         <class name="TopPersist" table="TopPersist">
-            <datastore-identity strategy="identity" column="KEY_VALUE"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
             <field name="doubleB" column="DOUBLE_B"/>
             <field name="intB" column="INT_B"/>
+            <field name="keyValue" column="KEY_VALUE"/>
         </class>
 
         <class name="TopPersistE">
@@ -81,12 +84,13 @@
         </class>
 
         <class name="FieldSameName" table="FieldSameName">
-            <datastore-identity strategy="identity" column="KEY_VALUE"/>
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
             <field name="n2" column="N2"/>
             <field name="n3" column="N3"/>
+            <field name="keyValue" column="KEY_VALUE"/>
         </class>
 
         <class name="FieldSameName2">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
Tue Jun  7 08:16:04 2005
@@ -4,13 +4,9 @@
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <datastore-identity strategy="identity">
-                <column name="ICKEY"/>
+                <column name="DATASTORE_IDENTITY"/>
             </datastore-identity>
-            <!--
-            <field name="keyValue">
-                <column name="ICKEY"/>
-            </field>
-            -->
+            <field name="keyValue" column="ICKEY"/>
             <field name="d" column="D"/>
             <field name="s" column="S"/>
             <field name="floatValue">
@@ -23,8 +19,9 @@
 
         <class name="InstanceCallbackClass" table="InstanceCallbacks">
             <datastore-identity strategy="identity">
-                <column name="ICKEY"/>
+                <column name="DATASTORE_IDENTITY"/>
             </datastore-identity>
+            <field name="keyValue" column="ICKEY"/>
             <field name="name" column="NAME"/>
             <field name="timeStamp">
                 <column name="TIMEDATE"/>

Added: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm?rev=188795&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm
(added)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm
Tue Jun  7 08:16:04 2005
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm>
+  <package name="org.apache.jdo.tck.pc.lifecycle">
+    <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
+       <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+       <field name="id" column="ID"/>
+       <field name="int_field" column="INT_FIELD"/>
+    </class>
+  </package>
+</orm>

Propchange: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
Tue Jun  7 08:16:04 2005
@@ -4,19 +4,22 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="ID"/>
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCPoint2" table="PCPoint2">
-      <datastore-identity strategy="identity" column="ID"/>
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCRect" table="PCRect">
-      <datastore-identity strategy="identity" column="ID"/>
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
       </field>
@@ -26,7 +29,8 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="ID"/>
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
       <field name="byteNotNull" column="byteNotNull"/>

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Tue Jun  7 08:16:04 2005
@@ -39,8 +39,8 @@
     byteNotNull SMALLINT NOT NULL,
     byteNull SMALLINT,
     shortNotNull SMALLINT NOT NULL,
-    shortNull SMALLINT NOT NULL,
-    intNotNull INTEGER,
+    shortNull SMALLINT,
+    intNotNull INTEGER NOT NULL,
     intNull INTEGER,
     longNotNull INTEGER NOT NULL,
     longNull INTEGER,
@@ -52,9 +52,9 @@
     charNull CHAR,
     dateNull DATE,
     stringNull VARCHAR (256),
-    bigDecimal DECIMAL NOT NULL,
-    bigInteger INTEGER NOT NULL,
-    PrimitiveTypes INTEGER NOT NULL,
+    bigDecimal DECIMAL,
+    bigInteger INTEGER,
+    PrimitiveTypes INTEGER,
     CONSTRAINT PT_CONST PRIMARY KEY (ID)
 );
 
@@ -7076,5 +7076,13 @@
 -------------------------
 --lifecycle
 -------------------------
+
+DROP TABLE STATETRANSITIONOBJ;
+
+CREATE TABLE STATETRANSITIONOBJ (
+    ID INTEGER NOT NULL,
+    INT_FIELD INTEGER NOT NULL,
+    CONSTRAINT ICNP_PK PRIMARY KEY (ID)
+);
 
 disconnect;



Mime
View raw message