db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r380965 [1/2] - in /db/jdo/trunk/tck20/src/orm: applicationidentity/org/apache/jdo/tck/api/instancecallbacks/ applicationidentity/org/apache/jdo/tck/pc/company/ applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ applicationidentity/org/a...
Date Sat, 25 Feb 2006 18:51:18 GMT
Author: clr
Date: Sat Feb 25 10:51:11 2006
New Revision: 380965

URL: http://svn.apache.org/viewcvs?rev=380965&view=rev
Log:
JDO-317 Remove primary-key and foreign-key from field elements

Modified:
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -9,28 +9,28 @@
 
         <class name="InstanceLifecycleListenerAttach$PC" 
                 table="LIFECYCLELISTENERATTACH">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerClear$PC" 
                 table="LIFECYCLELISTENERCLEAR">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerDelete$PC" 
                 table="LIFECYCLELISTENERDELETE">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerDetach$PC" 
                 table="LIFECYCLELISTENERDETACH">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
         </class>
         <class name="InstanceLifecycleListenerLoad$PC" 
                 table="LIFECYCLELISTENERLOAD">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
             <field name="value" column="VALUE"/>
         </class>
         <class name="InstanceLifecycleListenerStore$PC" 
                 table="LIFECYCLELISTENERSTORE">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
         </class>
     </package>
 </orm>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -8,7 +8,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
+            <field name="companyid" column="ID"/>
             <field name="name" column="NAME">
               <column name="NAME" sql-type="VARCHAR"/>
             </field>
@@ -27,9 +27,9 @@
         </class>
 
         <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
+            <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
+            <field name="company" column="COMPANYID"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
@@ -79,7 +79,7 @@
                 <discriminator strategy="class-name" column="DISCRIMINATOR"
                     indexed="true"/>
             </inheritance>
-            <field name="personid" column="PERSONID" primary-key="true"/>
+            <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
             <field name="middlename">
@@ -124,7 +124,7 @@
                     <index name="INS_DISCRIMINATOR_INDEX" unique="false"/>
                 </discriminator>
             </inheritance>
-            <field name="insid" column="INSID" primary-key="true"/>
+            <field name="insid" column="INSID"/>
             <field name="carrier" column="CARRIER"/>
             <field name="employee" column="EMPLOYEE">
                  <foreign-key/>
@@ -142,7 +142,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
+            <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
                <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm Sat Feb 25 10:51:11 2006
@@ -13,7 +13,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
+            <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
@@ -30,9 +30,9 @@
         </class>
 
         <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
+            <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
+            <field name="company" column="COMPANYID"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
@@ -85,7 +85,7 @@
 
         <class name="Person" table="persons">
             <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
+            <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
             <field name="middlename" column="MIDDLENAME"/>
@@ -108,7 +108,7 @@
 
         <class name="Insurance" table="insuranceplans">
             <inheritance strategy="new-table"/>
-            <field name="insid" column="INSID" primary-key="true"/>
+            <field name="insid" column="INSID"/>
             <field name="carrier" column="CARRIER"/>
             <field name="employee" column="EMPLOYEE">
                  <foreign-key/>
@@ -130,7 +130,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
+            <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
                <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm Sat Feb 25 10:51:11 2006
@@ -22,7 +22,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
+            <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
@@ -39,9 +39,9 @@
         </class>
 
         <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
+            <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
+            <field name="company" column="COMPANYID"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
@@ -49,7 +49,7 @@
 
         <class name="PartTimeEmployee" table="parttimeemployees">
             <inheritance strategy="new-table"/>
-            <field name="Person.personid" column="PERSONID" primary-key="true"/>
+            <field name="Person.personid" column="PERSONID"/>
             <field name="Person.firstname" column="FIRSTNAME"/>
             <field name="Person.lastname" column="LASTNAME"/>
             <field name="Person.middlename" column="MIDDLENAME"/>
@@ -98,7 +98,7 @@
 
         <class name="FullTimeEmployee" table="fulltimeemployees">
             <inheritance strategy="new-table"/>
-            <field name="Person.personid" column="PERSONID" primary-key="true"/>
+            <field name="Person.personid" column="PERSONID"/>
             <field name="Person.firstname" column="FIRSTNAME"/>
             <field name="Person.lastname" column="LASTNAME"/>
             <field name="Person.middlename" column="MIDDLENAME"/>
@@ -151,7 +151,7 @@
 
         <class name="Person" table="persons">
             <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
+            <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
             <field name="middlename" column="MIDDLENAME"/>
@@ -178,7 +178,7 @@
 
         <class name="DentalInsurance" table="dentalinsurance">
             <inheritance strategy="new-table"/>
-            <field name="Insurance.insid" column="INSID" primary-key="true"/>
+            <field name="Insurance.insid" column="INSID"/>
             <field name="Insurance.carrier" column="CARRIER"/>
             <field name="Insurance.employee" column="EMPLOYEE">
                  <foreign-key/>
@@ -188,7 +188,7 @@
 
         <class name="MedicalInsurance" table="medicalinsurance">
             <inheritance strategy="new-table"/>
-            <field name="Insurance.insid" column="INSID" primary-key="true"/>
+            <field name="Insurance.insid" column="INSID"/>
             <field name="Insurance.carrier" column="CARRIER"/>
             <field name="Insurance.employee" column="EMPLOYEE">
                  <foreign-key/>
@@ -197,7 +197,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
+            <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
                <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm Sat Feb 25 10:51:11 2006
@@ -15,7 +15,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
+            <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
@@ -32,9 +32,9 @@
         </class>
 
         <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
+            <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
+            <field name="company" column="COMPANYID"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
@@ -85,7 +85,7 @@
 
         <class name="Person" table="persons">
             <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
+            <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
             <field name="middlename" column="MIDDLENAME"/>
@@ -108,7 +108,7 @@
 
         <class name="Insurance">
             <inheritance strategy="subclass-table"/>
-            <field name="insid" column="INSID" primary-key="true"/>
+            <field name="insid" column="INSID"/>
             <field name="carrier" column="CARRIER"/>
             <field name="employee" column="EMPLOYEE">
                  <foreign-key/>
@@ -126,7 +126,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
+            <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
                <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm Sat Feb 25 10:51:11 2006
@@ -13,7 +13,7 @@
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
+            <field name="companyid" column="ID"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
@@ -30,9 +30,9 @@
         </class>
 
         <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
+            <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
+            <field name="company" column="COMPANYID"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
@@ -83,7 +83,7 @@
 
         <class name="Person" table="persons">
             <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
+            <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
             <field name="middlename" column="MIDDLENAME"/>
@@ -109,7 +109,7 @@
                 <discriminator strategy="class-name" column="DISCRIMINATOR"
                     indexed="true"/>
             </inheritance>
-            <field name="insid" column="INSID" primary-key="true"/>
+            <field name="insid" column="INSID"/>
             <field name="carrier" column="CARRIER"/>
             <field name="employee" column="EMPLOYEE">
                  <foreign-key/>
@@ -127,7 +127,7 @@
         </class>
 
         <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
+            <field name="projid" column="PROJID"/>
             <field name="name" column="NAME"/>
             <field name="budget">
                <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
-            <field name="id" column="ID" primary-key="true"/>
+            <field name="id" column="ID"/>
             <field name="fld_boolean" column="PRIMITIVEBOOLEAN"/>
             <field name="fld_byte" column="PRIMITIVEBYTE"/>
             <field name="fld_char">

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -6,7 +6,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJVAL"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="ArrayListOfObject0"
                    table="ARRAYLIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="CollectionOfObject0"
                    table="COLLECTION_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="BigDecimal1">
                 <column name="BIG_DECIMAL1" jdbc-type="DECIMAL" length="11" scale="4"/>
             </field>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="BigInteger1" column="BIG_INTEGER1"/>
             <field name="BigInteger102" column="BIG_INTEGER102"/>
             <field name="BigInteger103" column="BIG_INTEGER103"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Boolean1" column="BOOLEAN1"/>
             <field name="Boolean102" column="BOOLEAN102"/>
             <field name="Boolean103" column="BOOLEAN103"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Byte0" column="BYTE0"/>
             <field name="Byte1" column="BYTE1"/>
             <field name="Byte2" column="BYTE2"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Character0">
                 <column name="CHARACTER0" jdbc-type="INTEGER"/>
             </field>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Date0" column="DATE0"/>
             <field name="Date1" column="DATE1"/>
             <field name="Date102" column="DATE102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Double1" column="DOUBLE1"/>
             <field name="Double102" column="DOUBLE102"/>
             <field name="Double103" column="DOUBLE103"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Float0" column="FLOAT0"/>
             <field name="Float1" column="FLOAT1"/>
             <field name="Float102" column="FLOAT102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Integer0" column="INTEGER0"/>
             <field name="Integer1" column="INTEGER1"/>
             <field name="Integer102" column="INTEGER102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Locale0" column="LOCALE0"/>
             <field name="Locale1" column="LOCALE1"/>
             <field name="Locale102" column="LOCALE102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Long0" column="LONG0"/>
             <field name="Long1" column="LONG1"/>
             <field name="Long102" column="LONG102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Object1" column="OBJECT1">
             </field>
             <field name="Object102" column="OBJECT102">

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveBoolean" table="FIELDSOFPRIMITIVEBOOLEAN">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="boolean0" column="BOOLEAN0"/>
             <field name="boolean1" column="BOOLEAN1"/>
             <field name="boolean102" column="BOOLEAN102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="byte0" column="BYTE0"/>
             <field name="byte1" column="BYTE1"/>
             <field name="byte102" column="BYTE102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="char0" column="CHAR0"/>
             <field name="char1" column="CHAR1"/>
             <field name="char102" column="CHAR102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="double0" column="DOUBLE0"/>
             <field name="double1" column="DOUBLE1"/>
             <field name="double102" column="DOUBLE102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="float0" column="FLOAT0"/>
             <field name="float1" column="FLOAT1"/>
             <field name="float102" column="FLOAT102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="int0" column="INT0"/>
             <field name="int1" column="INT1"/>
             <field name="int102" column="INT102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="long0" column="LONG0"/>
             <field name="long1" column="LONG1"/>
             <field name="long102" column="LONG102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="short0" column="SHORT0"/>
             <field name="short1" column="SHORT1"/>
             <field name="short102" column="SHORT102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="Short0" column="SHORT0"/>
             <field name="Short1" column="SHORT1"/>
             <field name="Short102" column="SHORT102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="SimpleClass0" column="SIMPLECLASS0">
                 <foreign-key/>
             </field>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER">
+            <field name="identifier" column="IDENTIFIER">
             </field>
             <field name="SimpleInterface1" column="SIMPLEINTERFACE1">
             </field>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="String0" column="STRING0"/>
             <field name="String1" column="STRING1"/>
             <field name="String102" column="STRING102"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashSetOfObject0"
                    table="HASHSET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashtableOfString_Object0" table="HASHTBL_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="HashtableOfObject_String0"
                    table="HASHTBL_OBJECT0_STR">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="LinkedListOfObject0"
                    table="LINKEDLIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="ListOfObject0"
                    table="LIST_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="SetOfObject0"
                    table="SET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
-            <field name="id" primary-key="true" column="IDENTIFIER"/>
+            <field name="id" column="IDENTIFIER"/>
             <field name="intField" column="INTVAL"/>
             <field name="stringField" column="STRINGVAL"/>
         </class>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfString_Object0" table="TREEMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,7 +4,7 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeSetOfObject0" table="TREESET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="identifier" column="IDENTIFIER"/>
             <field name="VectorOfObject0"
                    table="VECTOR_OF_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -8,7 +8,7 @@
             </inheritance>
             <field name="intB" column="INT_B"/>
             <field name="doubleB" column="DOUBLE_B"/>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true"/>
+            <field name="keyValue" column="KEY_VALUE"/>
         </class>
 
         <class name="AllPersist2">
@@ -19,8 +19,8 @@
         <class name="AllPersist3">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
+            <field name="secondObj" column="SECOND_OBJ"/>
+            <field name="thirdObj" column="THIRD_OBJ"/>
         </class>
 
         <class name="AllPersist4">
@@ -32,7 +32,7 @@
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true" />
+            <field name="keyValue" column="KEY_VALUE" />
             <field name="doubleB" column="DOUBLE_B"/>
             <field name="intB" column="INT_B"/>
         </class>
@@ -45,8 +45,8 @@
         <class name="TopNonPersistF">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
+            <field name="secondObj" column="SECOND_OBJ"/>
+            <field name="thirdObj" column="THIRD_OBJ"/>
         </class>
 
         <class name="TopNonPersistH">
@@ -60,7 +60,7 @@
             </inheritance>
             <field name="doubleB" column="DOUBLE_B"/>
             <field name="intB" column="INT_B"/>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true" />
+            <field name="keyValue" column="KEY_VALUE" />
         </class>
 
         <class name="TopPersistE">
@@ -71,8 +71,8 @@
         <class name="TopPersistF">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
+            <field name="secondObj" column="SECOND_OBJ"/>
+            <field name="thirdObj" column="THIRD_OBJ"/>
         </class>
 
         <class name="TopPersistH">
@@ -86,7 +86,7 @@
             </inheritance>
             <field name="n2" column="N2"/>
             <field name="n3" column="N3"/>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true"/>
+            <field name="keyValue" column="KEY_VALUE"/>
         </class>
 
         <class name="FieldSameName2">
@@ -97,8 +97,8 @@
         <class name="FieldSameName3">
             <inheritance strategy="superclass-table"/>
             <field name="n1" column="FSN3_N1"/>
-            <field name="n2" column="FSN3_N2" foreign-key="true"/>
-            <field name="n3" column="FSN3_N3" foreign-key="true"/>
+            <field name="n2" column="FSN3_N2"/>
+            <field name="n3" column="FSN3_N3"/>
         </class>
 
         <class name="FieldSameName4">

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
-            <field name="keyValue" primary-key="true">
+            <field name="keyValue">
                 <column name="ICKEY"/>
             </field>
             <field name="d" column="D"/>
@@ -17,7 +17,7 @@
         </class>
 
         <class name="InstanceCallbackClass" table="InstanceCallbacks">
-            <field name="keyValue" primary-key="true">
+            <field name="keyValue">
                 <column name="ICKEY"/>
             </field>
             <field name="name" column="NAME"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm Sat Feb 25 10:51:11 2006
@@ -3,7 +3,7 @@
 <orm>
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
-       <field name="id" column="ID" primary-key="true"/>
+       <field name="id" column="ID"/>
        <field name="int_field" column="INT_FIELD"/>
     </class>
   </package>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,25 +4,25 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="VersionedPCPoint" table="VersionedPCPoint">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCRect" table="PCRect">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
       </field>
@@ -32,7 +32,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
       <field name="byteNotNull" column="byteNotNull"/>
@@ -57,7 +57,7 @@
     </class>
 
     <class name="PCClass" table="PCClass">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="number1" column="NUMBER1"/>
       <field name="number2" column="NUMBER2"/>
     </class>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm Sat Feb 25 10:51:11 2006
@@ -4,19 +4,19 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCRect" table="PCRect">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
       </field>
@@ -26,7 +26,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
       <field name="byteNotNull" column="byteNotNull"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm Sat Feb 25 10:51:11 2006
@@ -4,19 +4,19 @@
   <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity_pkg">
 
     <class name="PCPoint" table="PCPoint">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCRect" table="PCRect">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
       </field>
@@ -26,7 +26,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
       <field name="byteNotNull" column="byteNotNull"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm Sat Feb 25 10:51:11 2006
@@ -4,19 +4,19 @@
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCPoint2" table="PCPoint2" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCRect" table="PCRect" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="lowerRight" column="LOWER_RIGHT">
         <foreign-key/>
       </field>
@@ -26,7 +26,7 @@
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="booleanNotNull" column="booleanNotNull"/>
       <field name="booleanNull" column="booleanNull"/>
       <field name="byteNotNull" column="byteNotNull"/>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,11 +4,11 @@
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
-      <field name="select" column="ID" primary-key="true"/>
+      <field name="select" column="ID"/>
     </class>
 
     <class name="NoExtent" table="NoExtent">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
     </class>
 
   </package>

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm Sat Feb 25 10:51:11 2006
@@ -20,8 +20,8 @@
 
             <field name="id" column="ID"/>
             <field name="quantity" column="QUANTITY"/>
-            <field name="product" column="SKU" foreign-key="true"/>
-            <field name="cart" column="CART_ID" foreign-key="true"/>
+            <field name="product" column="SKU"/>
+            <field name="cart" column="CART_ID"/>
         </class>
 
         <class name="Product" table="PRODUCTS">



Mime
View raw message