Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
-       <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+       <datastore-identity column="DATASTORE_IDENTITY"/>
        <field name="id" column="ID"/>
        <field name="int_field" column="INT_FIELD"/>
     </class>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
-            <datastore-identity strategy="identity">
+            <datastore-identity>
                 <column name="DATASTORE_IDENTITY"/>
             </datastore-identity>
             <field name="keyValue" column="ICKEY"/>
@@ -18,7 +18,7 @@
         </class>
 
         <class name="InstanceCallbackClass" table="InstanceCallbacks">
-            <datastore-identity strategy="identity">
+            <datastore-identity>
                 <column name="DATASTORE_IDENTITY"/>
             </datastore-identity>
             <field name="keyValue" column="ICKEY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm	(working copy)
@@ -8,12 +8,12 @@
     <package name="org.apache.jdo.tck.pc.query">
 
         <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="select" column="ID"/>
         </class>
 
         <class name="NoExtent" table="NoExtent">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
         </class>
 
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(working copy)
@@ -8,7 +8,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
             <field name="name" column="NAME">
               <column name="NAME" sql-type="VARCHAR"/>
@@ -40,7 +40,7 @@
         </class>
 
         <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="company" column="COMPANYID"/>
@@ -92,7 +92,7 @@
         </class>
 
         <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -124,7 +124,7 @@
         </class>
 
         <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -146,7 +146,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(working copy)
@@ -13,7 +13,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
@@ -31,7 +31,7 @@
         </class>
 
         <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="company" column="COMPANYID"/>
@@ -89,7 +89,7 @@
         </class>
 
         <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table"/>
             <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
@@ -113,7 +113,7 @@
         </class>
 
         <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table"/>
             <field name="insid" column="INSID"/>
             <field name="carrier" column="CARRIER"/>
@@ -137,7 +137,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(working copy)
@@ -22,7 +22,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
@@ -40,7 +40,7 @@
         </class>
 
         <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="company" column="COMPANYID"/>
@@ -215,7 +215,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(working copy)
@@ -15,7 +15,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
@@ -33,7 +33,7 @@
         </class>
 
         <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="company" column="COMPANYID"/>
@@ -89,7 +89,7 @@
         </class>
 
         <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table"/>
             <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
@@ -113,7 +113,7 @@
         </class>
 
         <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="subclass-table"/>
             <field name="insid" column="INSID"/>
             <field name="carrier" column="CARRIER"/>
@@ -133,7 +133,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(working copy)
@@ -13,7 +13,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
@@ -31,7 +31,7 @@
         </class>
 
         <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="company" column="COMPANYID"/>
@@ -87,7 +87,7 @@
         </class>
 
         <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table"/>
             <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
@@ -111,7 +111,7 @@
         </class>
 
         <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"
                     indexed="true"/>
@@ -134,7 +134,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Date0" column="DATE0"/>
             <field name="Date1" column="DATE1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashtableOfString_Object0" table="HASHTBL_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="SetOfObject0"
                    table="SET_OF_OBJECT0">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="SimpleClass0" column="SIMPLECLASS0">
                 <foreign-key/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="BigInteger1" column="BIG_INTEGER1"/>
             <field name="BigInteger102" column="BIG_INTEGER102"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Boolean1" column="BOOLEAN1"/>
             <field name="Boolean102" column="BOOLEAN102"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
             <field name="fld_boolean" column="PRIMITIVEBOOLEAN"/>
             <field name="fld_byte" column="PRIMITIVEBYTE"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="int0" column="INT0"/>
             <field name="int1" column="INT1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="short0" column="SHORT0"/>
             <field name="short1" column="SHORT1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="ArrayListOfObject0" table="ARRAYLIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Integer0" column="INTEGER0"/>
             <field name="Integer1" column="INTEGER1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="float0" column="FLOAT0"/>
             <field name="float1" column="FLOAT1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Short0" column="SHORT0"/>
             <field name="Short1" column="SHORT1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Long0" column="LONG0"/>
             <field name="Long1" column="LONG1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm	(working copy)
@@ -6,8 +6,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
            <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Byte0" column="BYTE0"/>
             <field name="Byte1" column="BYTE1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Float0" column="FLOAT0"/>
             <field name="Float1" column="FLOAT1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="char0" column="CHAR0"/>
             <field name="char1" column="CHAR1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Double1" column="DOUBLE1"/>
             <field name="Double102" column="DOUBLE102"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="SimpleInterface1" column="SIMPLEINTERFACE1">
             </field>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="CollectionOfObject0"
                    table="COLLECTION_OF_OBJECT0">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfString_Object0" table="TREEMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="BigDecimal1">
                 <column name="BIG_DECIMAL1" jdbc-type="DECIMAL" length="11" scale="4"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashSetOfObject0"
                    table="HASHSET_OF_OBJECT0">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="VectorOfObject0"
                    table="VECTOR_OF_OBJECT0">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="LinkedListOfObject0"
                    table="LINKEDLIST_OF_OBJECT0">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="long0" column="LONG0"/>
             <field name="long1" column="LONG1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="byte0" column="BYTE0"/>
             <field name="byte1" column="BYTE1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Character0">
                 <column name="CHARACTER0" jdbc-type="INTEGER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="ListOfObject0"
                    table="LIST_OF_OBJECT0">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeSetOfObject0" table="TREESET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Locale0" column="LOCALE0"/>
             <field name="Locale1" column="LOCALE1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm	(working copy)
@@ -3,8 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
                 <join column="IDENTIFIER"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm	(working copy)
@@ -4,8 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashtableOfObject_String0"
                    table="HASHTBL_OBJECT0_STR">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="double0" column="DOUBLE0"/>
             <field name="double1" column="DOUBLE1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="IDENTIFIER"/>
             <field name="intField" column="INTVAL"/>
             <field name="stringField" column="STRINGVAL"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="String0" column="STRING0"/>
             <field name="String1" column="STRING1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="Object0" column="OBJECT0"/>
             <field name="Object1" column="OBJECT1">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="boolean0" column="BOOLEAN0"/>
             <field name="boolean1" column="BOOLEAN1"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm	(working copy)
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -30,7 +30,7 @@
         </class>
 
         <class name="TopNonPersistB" table="TopNonPersistB">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -57,7 +57,7 @@
         </class>
 
         <class name="TopPersist" table="TopPersist">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -84,7 +84,7 @@
         </class>
 
         <class name="FieldSameName" table="FieldSameName">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm	(working copy)
@@ -4,28 +4,28 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="VersionedPCPoint" table="VersionedPCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-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="DATASTORE_IDENTITY"/>
+      <datastore-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="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
@@ -36,7 +36,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
@@ -62,7 +62,7 @@
     </class>
 
     <class name="PCClass" table="PCClass">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="number1" column="NUMBER1"/>
       <field name="number2" column="NUMBER2"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(working copy)
@@ -4,21 +4,21 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-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="DATASTORE_IDENTITY"/>
+      <datastore-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="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
@@ -29,7 +29,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(working copy)
@@ -4,21 +4,21 @@
   <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity_pkg" >
 
     <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-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="DATASTORE_IDENTITY"/>
+      <datastore-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="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
@@ -29,7 +29,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(working copy)
@@ -4,21 +4,21 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-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" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-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" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
@@ -29,7 +29,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <datastore-identity column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm	(revision 381363)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm	(working copy)
@@ -9,33 +9,33 @@
 
         <class name="InstanceLifecycleListenerAttach$PC" 
                 table="LIFECYCLELISTENERATTACH">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerClear$PC" 
                 table="LIFECYCLELISTENERCLEAR">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerDelete$PC" 
                 table="LIFECYCLELISTENERDELETE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerDetach$PC" 
                 table="LIFECYCLELISTENERDETACH">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerLoad$PC" 
                 table="LIFECYCLELISTENERLOAD">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
             <field name="value" column="VALUE"/>
         </class>
         <class name="InstanceLifecycleListenerStore$PC" 
                 table="LIFECYCLELISTENERSTORE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <datastore-identity column="DATASTORE_IDENTITY"/>
             <field name="id" column="ID"/>
         </class>
     </package>