You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/02/25 19:51:18 UTC

svn commit: r380965 [2/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...

Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -4,19 +4,19 @@
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte" table="PCPointSingleFieldByte">
-      <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="PCPointSingleFieldByte" table="PCPointSingleFieldByte">
-      <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="PCPointSingleFieldPrimitivechar" table="PCPointSingleFieldChar">
-      <field name="id" primary-key="true">
+      <field name="id">
         <column name="ID" jdbc-type="INTEGER"/>
       </field>
       <field name="x" column="X"/>
@@ -24,7 +24,7 @@
     </class>
 
     <class name="PCPointSingleFieldCharacter" table="PCPointSingleFieldChar">
-      <field name="id" primary-key="true">
+      <field name="id">
         <column name="ID" jdbc-type="INTEGER"/>
       </field>
       <field name="x" column="X"/>
@@ -32,49 +32,49 @@
     </class>
 
     <class name="PCPointSingleFieldPrimitiveint" table="PCPointSingleFieldInteger">
-      <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="PCPointSingleFieldInteger" table="PCPointSingleFieldInteger">
-      <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="PCPointSingleFieldPrimitivelong" table="PCPointSingleFieldLong">
-      <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="PCPointSingleFieldLong" table="PCPointSingleFieldLong">
-      <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="PCPointSingleFieldPrimitiveshort" table="PCPointSingleFieldShort">
-      <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="PCPointSingleFieldShort" table="PCPointSingleFieldShort">
-      <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="PCPointSingleFieldString" table="PCPointSingleFieldString">
-      <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="PCPointSingleFieldDate" table="PCPointSingleFieldDate">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" column="ID"/>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>

Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -43,7 +43,7 @@
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <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"/>

Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm Sat Feb 25 10:51:11 2006
@@ -34,7 +34,7 @@
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <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"/>

Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm Sat Feb 25 10:51:11 2006
@@ -43,7 +43,7 @@
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <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"/>

Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm Sat Feb 25 10:51:11 2006
@@ -36,7 +36,7 @@
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <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"/>

Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm Sat Feb 25 10:51:11 2006
@@ -34,7 +34,7 @@
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <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"/>

Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm Sat Feb 25 10:51:11 2006
@@ -20,8 +20,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">
@@ -47,8 +47,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">
@@ -74,8 +74,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">
@@ -101,8 +101,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/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm?rev=380965&r1=380964&r2=380965&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm Sat Feb 25 10:51:11 2006
@@ -22,8 +22,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">