db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r556949 [2/2] - in /db/jdo/trunk/tck2: ./ src/java/org/apache/jdo/tck/pc/company/ src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/ src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/ src/jdo/applicationidentity/org/apache/jdo/tck/pc/compa...
Date Tue, 17 Jul 2007 15:36:59 GMT
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java Tue Jul 17 08:36:42 2007
@@ -27,10 +27,10 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.jdo.tck.pc.company.ICompany;
 import org.apache.jdo.tck.pc.company.IDepartment;
 import org.apache.jdo.tck.pc.company.IEmployee;
+
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -38,7 +38,6 @@
  * This class represents a department within a company.
  */
 @PersistenceCapable(table="departments")
-@Implements ("org.apache.jdo.tck.pc.company.IDepartment")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -269,7 +268,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IDepartment otherDept = (IDepartment)other;
+        FCDepartment otherDept = (FCDepartment)other;
         String where = "FCDepartment<" + deptid + ">";
         return 
             helper.equals(deptid, otherDept.getDeptid(), where + ".deptid") & 
@@ -310,14 +309,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IDepartment)o);
+        return compareTo((FCDepartment)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IDepartment)o1, (IDepartment)o2);
+        return compare((FCDepartment)o1, (FCDepartment)o2);
     }
 
     /** 
@@ -330,7 +329,7 @@
      * object is less than, equal to, or greater than the specified
      * Department object. 
      */
-    public int compareTo(IDepartment other) {
+    public int compareTo(FCDepartment other) {
         return compare(this, other);
     }
 
@@ -343,7 +342,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IDepartment o1, IDepartment o2) {
+    public static int compare(FCDepartment o1, FCDepartment o2) {
         return EqualityHelper.compare(o1.getDeptid(), o2.getDeptid());
     }
     
@@ -354,8 +353,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IDepartment) {
-            return compareTo((IDepartment)obj) == 0;
+        if (obj instanceof FCDepartment) {
+            return compareTo((FCDepartment)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java Tue Jul 17 08:36:42 2007
@@ -26,20 +26,16 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-
-import org.apache.jdo.tck.pc.company.IAddress;
 import org.apache.jdo.tck.pc.company.IDentalInsurance;
 import org.apache.jdo.tck.pc.company.IDepartment;
 import org.apache.jdo.tck.pc.company.IEmployee;
 import org.apache.jdo.tck.pc.company.IMedicalInsurance;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
  * This class represents an employee.
  */
 @PersistenceCapable
-@Implements ("org.apache.jdo.tck.pc.company.IEmployee")
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
 public abstract class FCEmployee extends FCPerson implements IEmployee {
@@ -112,7 +108,7 @@
      * @param hiredate The date that the employee was hired.
      */
     public FCEmployee(long personid, String firstname, String lastname, 
-                    String middlename, Date birthdate, IAddress address,
+                    String middlename, Date birthdate, FCAddress address,
                     Date hiredate) {
         super(personid, firstname, lastname, middlename, birthdate, address);
         this.hiredate = hiredate;
@@ -225,7 +221,7 @@
      * Get the dental insurance of the employee.
      * @return The employee's dental insurance.
      */
-    public IDentalInsurance getDentalInsurance() {
+    public FCDentalInsurance getDentalInsurance() {
         return dentalInsurance;
     }
 
@@ -259,7 +255,7 @@
      * @return The department associated with the employee.
      */
     public IDepartment getDepartment() {
-        return (IDepartment)department;
+        return department;
     }
 
     /**
@@ -275,7 +271,7 @@
      * @return The funding department associated with the employee.
      */
     public IDepartment getFundingDept() {
-        return (IDepartment)fundingDept;
+        return fundingDept;
     }
 
     /**
@@ -477,7 +473,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IEmployee otherEmp = (IEmployee)other;
+        FCEmployee otherEmp = (FCEmployee)other;
         String where = "Employee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.equals(hiredate, otherEmp.getHiredate(),  where + ".hiredate") &

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCFullTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCFullTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCFullTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -20,21 +20,18 @@
 import javax.jdo.annotations.*;
 
 import java.util.Date;
-
 import org.apache.jdo.tck.pc.company.IAddress;
-import org.apache.jdo.tck.pc.company.IEmployee;
 import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
  * This class represents a full-time employee.
  */
 @PersistenceCapable
-@Implements ("org.apache.jdo.tck.pc.company.IFullTimeEmployee")
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
-public class FCFullTimeEmployee extends FCEmployee implements IFullTimeEmployee {
+public class FCFullTimeEmployee extends FCEmployee
+        implements IFullTimeEmployee {
 
     @Column(name="SALARY")
     private double salary;
@@ -75,7 +72,7 @@
     public FCFullTimeEmployee(long personid, String first, String last,
                             String middle, Date born, IAddress addr, 
                             Date hired, double sal) {
-        super(personid, first, last, middle, born, addr, hired);
+        super(personid, first, last, middle, born, (FCAddress)addr, hired);
         salary = sal;
     }
 
@@ -128,7 +125,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IFullTimeEmployee otherEmp = (IFullTimeEmployee)other;
+        FCFullTimeEmployee otherEmp = (FCFullTimeEmployee)other;
         String where = "FCFullTimeEmployee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.closeEnough(salary, otherEmp.getSalary(), where + ".salary");

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java Tue Jul 17 08:36:42 2007
@@ -22,9 +22,9 @@
 import java.io.Serializable;
 
 import java.util.Comparator;
-
 import org.apache.jdo.tck.pc.company.IEmployee;
 import org.apache.jdo.tck.pc.company.IInsurance;
+
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -33,7 +33,6 @@
  * <code>FCEmployee</code>.
  */
 @PersistenceCapable(table="insuranceplans")
-@Implements ("org.apache.jdo.tck.pc.company.IInsurance")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
@@ -70,10 +69,10 @@
      * @param carrier The insurance carrier.
      * @param employee The employee associated with this insurance. 
      */
-    protected FCInsurance(long insid, String carrier, IEmployee employee) {
+    protected FCInsurance(long insid, String carrier, FCEmployee employee) {
         this.insid = insid;
         this.carrier = carrier;
-        this.employee = (FCEmployee)employee;
+        this.employee = employee;
     }
 
     /**
@@ -115,7 +114,7 @@
      * @return The employee for this insurance.
      */
     public IEmployee getEmployee() {
-        return (IEmployee)employee;
+        return employee;
     }
 
     /**
@@ -158,7 +157,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IInsurance otherIns = (IInsurance)other;
+        FCInsurance otherIns = (FCInsurance)other;
         String where = "FCInsurance<" + insid + ">";
         return
             helper.equals(insid, otherIns.getInsid(), where + ".insid") &
@@ -177,14 +176,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IInsurance)o);
+        return compareTo((FCInsurance)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IInsurance)o1, (IInsurance)o2);
+        return compare((FCInsurance)o1, (FCInsurance)o2);
     }
 
     /** 
@@ -197,7 +196,7 @@
      * object is less than, equal to, or greater than the specified
      * Insurance object. 
      */
-    public int compareTo(IInsurance other) {
+    public int compareTo(FCInsurance other) {
         return compare(this, other);
     }
 
@@ -210,7 +209,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IInsurance o1, IInsurance o2) {
+    public static int compare(FCInsurance o1, FCInsurance o2) {
         return EqualityHelper.compare(o1.getInsid(), o2.getInsid());
     }
     
@@ -221,8 +220,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IInsurance) {
-            return compareTo((IInsurance)obj) == 0;
+        if (obj instanceof FCInsurance) {
+            return compareTo((FCInsurance)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCMedicalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCMedicalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCMedicalInsurance.java Tue Jul 17 08:36:42 2007
@@ -18,12 +18,7 @@
 package org.apache.jdo.tck.pc.companyAnnotatedDS;
 
 import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-
-import org.apache.jdo.tck.pc.company.IEmployee;
 import org.apache.jdo.tck.pc.company.IMedicalInsurance;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
@@ -31,9 +26,9 @@
  * particular <code>Employee</code>.
  */
 @PersistenceCapable
-@Implements ("org.apache.jdo.tck.pc.company.IInsurance")
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
-public class FCMedicalInsurance extends FCInsurance implements IMedicalInsurance {
+public class FCMedicalInsurance extends FCInsurance
+        implements IMedicalInsurance {
 
     @Column(name="PLANTYPE")
     private String planType; // possible values: "PPO", "EPO", "NPO" 
@@ -64,7 +59,7 @@
      * @param planType The planType.
      */
     public FCMedicalInsurance(long insid, String carrier, 
-                            IEmployee employee, String planType)
+                            FCEmployee employee, String planType)
     {
         super(insid, carrier, employee);
         this.planType = planType;
@@ -120,7 +115,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IMedicalInsurance otherIns = (IMedicalInsurance)other;
+        FCMedicalInsurance otherIns = (FCMedicalInsurance)other;
         String where = "FCMedicalInsurance<" + getInsid() + ">";
         return super.deepCompareFields(otherIns, helper) &
             helper.equals(planType, otherIns.getPlanType(), where + ".planType");

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPartTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPartTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPartTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -20,17 +20,14 @@
 import javax.jdo.annotations.*;
 
 import java.util.Date;
-
 import org.apache.jdo.tck.pc.company.IAddress;
 import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
  * This class represents a part-time employee.
  */
 @PersistenceCapable
-@Implements ("org.apache.jdo.tck.pc.company.IPartTimeEmployee")
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
 public class FCPartTimeEmployee extends FCEmployee implements IPartTimeEmployee {
@@ -74,7 +71,7 @@
     public FCPartTimeEmployee(long personid, String first, String last,
                             String middle, Date born, IAddress addr, 
                             Date hired, double wage ) {
-        super(personid, first, last, middle, born, addr, hired);
+        super(personid, first, last, middle, born, (FCAddress)addr, hired);
         this.wage = wage;
     }
 
@@ -127,7 +124,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                         EqualityHelper helper) {
-        IPartTimeEmployee otherEmp = (IPartTimeEmployee)other;
+        FCPartTimeEmployee otherEmp = (FCPartTimeEmployee)other;
         String where = "FCPartTimeEmployee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.closeEnough(wage, otherEmp.getWage(), where + ".wage");

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java Tue Jul 17 08:36:42 2007
@@ -29,9 +29,9 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.jdo.tck.pc.company.IAddress;
 import org.apache.jdo.tck.pc.company.IPerson;
+
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -39,7 +39,6 @@
  * This class represents a person.
  */
 @PersistenceCapable(table="persons")
-@Implements ("org.apache.jdo.tck.pc.company.IPerson")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
@@ -309,7 +308,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IPerson otherPerson = (IPerson)other;
+        FCPerson otherPerson = (FCPerson)other;
         String where = "FCPerson<" + personid + ">";
         return 
             helper.equals(personid, otherPerson.getPersonid(), where + ".personid") &
@@ -332,14 +331,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IPerson)o);
+        return compareTo((FCPerson)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IPerson)o1, (IPerson)o2);
+        return compare((FCPerson)o1, (FCPerson)o2);
     }
 
     /** 
@@ -352,7 +351,7 @@
      * object is less than, equal to, or greater than the specified FCPerson 
      * object. 
      */
-    public int compareTo(IPerson other) {
+    public int compareTo(FCPerson other) {
         return compare(this, other);
     }
 
@@ -365,7 +364,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IPerson o1, IPerson o2) {
+    public static int compare(FCPerson o1, FCPerson o2) {
         return EqualityHelper.compare(o1.getPersonid(), o2.getPersonid());
     }
     
@@ -376,8 +375,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IPerson) {
-            return compareTo((IPerson)obj) == 0;
+        if (obj instanceof FCPerson) {
+            return compareTo((FCPerson)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java Tue Jul 17 08:36:42 2007
@@ -28,8 +28,8 @@
 import java.util.Set;
 import java.util.HashSet;
 import java.math.BigDecimal;
-
 import org.apache.jdo.tck.pc.company.IProject;
+
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -38,7 +38,6 @@
  * employees working on it.
  */
 @PersistenceCapable(table="projects")
-@Implements ("org.apache.jdo.tck.pc.company.IProject")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -245,7 +244,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IProject otherProject = (IProject)other;
+        FCProject otherProject = (FCProject)other;
         String where = "FCProject<" + projid + ">";
         return 
             helper.equals(projid, otherProject.getProjid(), where + ".projid") &
@@ -266,14 +265,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IProject)o);
+        return compareTo((FCProject)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IProject)o1, (IProject)o2);
+        return compare((FCProject)o1, (FCProject)o2);
     }
 
     /** 
@@ -286,7 +285,7 @@
      * object is less than, equal to, or greater than the specified FCProject
      * object. 
      */
-    public int compareTo(IProject other) {
+    public int compareTo(FCProject other) {
         return compare(this, other);
     }
 
@@ -299,7 +298,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IProject o1, IProject o2) {
+    public static int compare(FCProject o1, FCProject o2) {
         return EqualityHelper.compare(o1.getProjid(), o2.getProjid());
     }
 
@@ -310,8 +309,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IProject) {
-            return compareTo((IProject)obj) == 0;
+        if (obj instanceof FCProject) {
+            return compareTo((FCProject)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java Tue Jul 17 08:36:42 2007
@@ -18,7 +18,6 @@
 package org.apache.jdo.tck.pc.companyAnnotatedDS;
 
 import javax.jdo.annotations.*;
-
 import org.apache.jdo.tck.pc.company.IAddress;
 
 /**

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java Tue Jul 17 08:36:42 2007
@@ -21,6 +21,7 @@
 
 import java.util.Date;
 import java.util.Set;
+import org.apache.jdo.tck.pc.company.IAddress;
 
 import org.apache.jdo.tck.pc.company.ICompany;
 
@@ -47,7 +48,7 @@
             @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
             @Field(name="country", columns=@Column(name="COUNTRY"))
     })
-    PIAddress getAddress();
+    IAddress getAddress();
     @Column(name="ID")
     long getCompanyid();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@@ -58,7 +59,7 @@
     @Column(name="NAME", jdbcType="VARCHAR")
     String getName();
     
-    void setAddress(PIAddress a);
+    void setAddress(IAddress a);
     void setCompanyid(long id);
     void setDepartments(Set depts);
     void setFounded(Date date);

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java Tue Jul 17 08:36:42 2007
@@ -29,7 +29,7 @@
  * the purpose of the interface.
  */
 @PersistenceCapable
-public interface PIDentalInsurance extends PIInsurance, IDentalInsurance {
+public interface PIDentalInsurance extends IDentalInsurance, PIInsurance {
 
     @Column(name="LIFETIME_ORTHO_BENEFIT")
     BigDecimal getLifetimeOrthoBenefit();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java Tue Jul 17 08:36:42 2007
@@ -20,8 +20,10 @@
 import javax.jdo.annotations.*;
 
 import java.util.Set;
+import org.apache.jdo.tck.pc.company.ICompany;
 
 import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IEmployee;
 
 /**
  * This interface represents the persistent state of Department.
@@ -29,7 +31,6 @@
  * the purpose of the interface.
  */
 @PersistenceCapable(table="departments")
-@Implements ("org.apache.jdo.tck.pc.company.IDepartment")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -42,9 +43,9 @@
     @Column(name="NAME")
     String getName();
     @Column(name="COMPANYID")
-    PICompany getCompany();
+    ICompany getCompany();
     @Column(name="EMP_OF_THE_MONTH")
-    PIEmployee getEmployeeOfTheMonth();
+    IEmployee getEmployeeOfTheMonth();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
             mappedBy="department")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
@@ -56,8 +57,8 @@
     
     void setDeptid(long deptid);
     void setName(String name);
-    void setCompany(PICompany company);
-    void setEmployeeOfTheMonth(PIEmployee employeeOfTheMonth);
+    void setCompany(ICompany company);
+    void setEmployeeOfTheMonth(IEmployee employeeOfTheMonth);
     void setEmployees(Set employees);
     void setFundedEmps(Set employees);
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java Tue Jul 17 08:36:42 2007
@@ -21,8 +21,10 @@
 
 import java.util.Date;
 import java.util.Set;
-
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
 import org.apache.jdo.tck.pc.company.IEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
 
 /**
  * This interface represents the persistent state of Employee.
@@ -31,7 +33,7 @@
  */
 @PersistenceCapable
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIEmployee extends PIPerson, IEmployee {
+public interface PIEmployee extends IEmployee, PIPerson {
 
     @Column(name="HIREDATE")
     Date getHiredate();
@@ -46,25 +48,25 @@
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIProject.class)
     Set getProjects();
     @Property(mappedBy="employee")
-    PIDentalInsurance getDentalInsurance();
+    IDentalInsurance getDentalInsurance();
     @Property(mappedBy="employee")
-    PIMedicalInsurance getMedicalInsurance();
+    IMedicalInsurance getMedicalInsurance();
     @Column(name="DEPARTMENT")
-    PIDepartment getDepartment();
+    IDepartment getDepartment();
     @Column(name="FUNDINGDEPT")
-    PIDepartment getFundingDept();
+    IDepartment getFundingDept();
     @Column(name="MANAGER")
-    PIEmployee getManager();
+    IEmployee getManager();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
             mappedBy="manager")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
     Set getTeam();
     @Column(name="MENTOR")
-    PIEmployee getMentor();
+    IEmployee getMentor();
     @Property(mappedBy="mentor")
-    PIEmployee getProtege();
+    IEmployee getProtege();
     @Column(name="HRADVISOR")
-    PIEmployee getHradvisor();
+    IEmployee getHradvisor();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
     Set getHradvisees();
@@ -73,15 +75,15 @@
     void setWeeklyhours(double weeklyhours);
     void setReviewedProjects(Set reviewedProjects);
     void setProjects(Set projects);
-    void setDentalInsurance(PIDentalInsurance dentalInsurance);
-    void setMedicalInsurance(PIMedicalInsurance medicalInsurance);
-    void setDepartment(PIDepartment department);
-    void setFundingDept(PIDepartment department);
-    void setManager(PIEmployee manager);
+    void setDentalInsurance(IDentalInsurance dentalInsurance);
+    void setMedicalInsurance(IMedicalInsurance medicalInsurance);
+    void setDepartment(IDepartment department);
+    void setFundingDept(IDepartment department);
+    void setManager(IEmployee manager);
     void setTeam(Set team);
-    void setMentor(PIEmployee mentor);
-    void setProtege(PIEmployee protege);
-    void setHradvisor(PIEmployee hradvisor);
+    void setMentor(IEmployee mentor);
+    void setProtege(IEmployee protege);
+    void setHradvisor(IEmployee hradvisor);
     void setHradvisees(Set hradvisees);
     
 }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -28,7 +28,7 @@
  */
 @PersistenceCapable
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIFullTimeEmployee extends PIEmployee, IFullTimeEmployee {
+public interface PIFullTimeEmployee extends IFullTimeEmployee, PIEmployee {
 
     @Column(name="SALARY")
     double getSalary();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java Tue Jul 17 08:36:42 2007
@@ -18,6 +18,7 @@
 package org.apache.jdo.tck.pc.companyAnnotatedDS;
 
 import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IEmployee;
 
 import org.apache.jdo.tck.pc.company.IInsurance;
 
@@ -41,9 +42,9 @@
     @Column(name="CARRIER")
     String getCarrier();
     @Column(name="EMPLOYEE")
-    PIEmployee getEmployee();
+    IEmployee getEmployee();
 
     void setInsid(long insid);
     void setCarrier(String carrier);
-    void setEmployee(PIEmployee employee);
+    void setEmployee(IEmployee employee);
 }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java Tue Jul 17 08:36:42 2007
@@ -27,7 +27,7 @@
  * the purpose of the interface.
  */
 @PersistenceCapable
-public interface PIMedicalInsurance extends PIInsurance, IMedicalInsurance {
+public interface PIMedicalInsurance extends IMedicalInsurance, PIInsurance {
 
     @Column(name="PLANTYPE")
     String getPlanType();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -28,7 +28,7 @@
  */
 @PersistenceCapable
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIPartTimeEmployee extends PIEmployee, IPartTimeEmployee {
+public interface PIPartTimeEmployee extends IPartTimeEmployee, PIEmployee {
 
     @Column(name="WAGE")
     double getWage();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java Tue Jul 17 08:36:42 2007
@@ -21,6 +21,7 @@
 
 import java.util.Date;
 import java.util.Map;
+import org.apache.jdo.tck.pc.company.IAddress;
 
 import org.apache.jdo.tck.pc.company.IPerson;
 
@@ -56,7 +57,7 @@
             @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
             @Field(name="country", columns=@Column(name="COUNTRY"))
     })
-    PIAddress getAddress();
+    IAddress getAddress();
     Date getBirthdate();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type")
     @Join(column="EMPID")
@@ -68,7 +69,7 @@
     void setLastname(String lastname);
     void setFirstname(String firstname);
     void setMiddlename(String middlename);
-    void setAddress(PIAddress address);
+    void setAddress(IAddress address);
     void setBirthdate(Date birthdate);
     void setPhoneNumbers(Map phoneNumbers);
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java Tue Jul 17 08:36:42 2007
@@ -43,15 +43,15 @@
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     BigDecimal getBudget();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class,
             column="REVIEWER")
     @Join(column="PROJID", table="proj_reviewer")
     //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
     Set getReviewers();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class,
             column="MEMBER")
-    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
+    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class,
     //    foreignKey=@ForeignKey(name="PR_REV_FK"))
     @Join(column="PROJID", table="proj_member")
     Set getMembers();
@@ -59,11 +59,7 @@
     void setProjid(long projid);
     void setName(String name);
     void setBudget(BigDecimal budget);
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
     void setReviewers(Set reviewers);
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
     void setMembers(Set employees);
     
 }

Modified: db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo (original)
+++ db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo Tue Jul 17 08:36:42 2007
@@ -144,63 +144,64 @@
             </field>
         </class>
 
-        <interface name="IAddress" embedded-only="true" requires-extent="false"/>
+        <interface name="PIAddress" embedded-only="true" requires-extent="false"/>
 
-        <interface name="ICompany"
+        <interface name="PICompany"
             identity-type="application">
             <property name="companyid" primary-key="true"/>
             <property name="address"
+                   field-type="org.apache.jdo.tck.pc.company.PIAddress"
                    persistence-modifier="persistent"/>
             <property name="departments" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IDepartment"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIDepartment"/>
             </property>
         </interface>
 
-        <interface name="IDentalInsurance"
+        <interface name="PIDentalInsurance"
             identity-type="application"/>
 
-        <interface name="IDepartment"
+        <interface name="PIDepartment"
             identity-type="application">
             <property name="deptid" primary-key="true"/>
             <property name="employees" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
             <property name="fundedEmps" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
         </interface>
 
-        <interface name="IEmployee"
+        <interface name="PIEmployee"
             identity-type="application">
             <property name="reviewedProjects" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IProject"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
             <property name="projects" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IProject"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
             <property name="team" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
             <property name="hradvisees" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
         </interface>
 
-        <interface name="IFullTimeEmployee"
+        <interface name="PIFullTimeEmployee"
             identity-type="application"/>
 
-        <interface name="IInsurance"
+        <interface name="PIInsurance"
             identity-type="application">
             <property name="insid" primary-key="true"/>
         </interface>
 
-        <interface name="IMedicalInsurance"
+        <interface name="PIMedicalInsurance"
             identity-type="application"/>
 
-        <interface name="IPartTimeEmployee"
+        <interface name="PIPartTimeEmployee"
             identity-type="application"/>
 
-        <interface name="IPerson"
+        <interface name="PIPerson"
             identity-type="application">
             <property name="personid" primary-key="true"/>
             <property name="middlename" default-fetch-group="false"/>
@@ -212,43 +213,43 @@
             <query name="validNotUnique">
                 SELECT firstname, lastname 
                 INTO org.apache.jdo.tck.query.result.classes.FullName 
-                FROM org.apache.jdo.tck.pc.company.IPerson
+                FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="validUnique">
                 SELECT UNIQUE firstname, lastname 
                 INTO org.apache.jdo.tck.query.result.classes.FullName 
-                FROM org.apache.jdo.tck.pc.company.IPerson 
+                FROM org.apache.jdo.tck.pc.company.PIPerson 
                 WHERE firstname == 'emp1First'
             </query>
             <query name="invalidUnique">
                 SELECT UNIQUE firstname, lastname 
                 INTO org.apache.jdo.tck.query.result.classes.FullName
-                FROM org.apache.jdo.tck.pc.company.IPerson
+                FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="unmodifiable" unmodifiable="true">
                 SELECT firstname, lastname 
-                FROM org.apache.jdo.tck.pc.company.IPerson
+                FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="packageJDO">
-                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+                SELECT FROM org.apache.jdo.tck.pc.company.PIPerson
                 WHERE personid > 1
             </query>
             <query name="changeQuery">
-                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+                SELECT FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="invalidQuery">
-                SeLeCt FrOm org.apache.jdo.tck.pc.company.IPerson
+                SeLeCt FrOm org.apache.jdo.tck.pc.company.PIPerson
             </query>
         </interface>
 
-        <interface name="IProject"
+        <interface name="PIProject"
             identity-type="application">
             <property name="projid" primary-key="true"/>
             <property name="reviewers" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
             <property name="members" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
         </interface>
     </package>

Modified: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo (original)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo Tue Jul 17 08:36:42 2007
@@ -118,21 +118,22 @@
             </field>
         </class>
 
-        <interface name="IAddress" embedded-only="true" requires-extent="false"/>
+        <interface name="PIAddress" embedded-only="true" requires-extent="false"/>
 
-        <interface name="ICompany"
+        <interface name="PICompany"
             identity-type="datastore">
             <property name="address"
+                   field-type="org.apache.jdo.tck.pc.company.PIAddress"
                    persistence-modifier="persistent"/>
             <property name="departments" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.IDepartment"/>
             </property>
         </interface>
 
-        <interface name="IDentalInsurance"
+        <interface name="PIDentalInsurance"
             identity-type="datastore"/>
 
-        <interface name="IDepartment"
+        <interface name="PIDepartment"
             identity-type="datastore">
             <property name="employees" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
@@ -142,13 +143,13 @@
             </property>
         </interface>
 
-        <interface name="IEmployee"
+        <interface name="PIEmployee"
             identity-type="datastore">
             <property name="reviewedProjects" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IProject"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
             <property name="projects" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IProject"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
             <property name="team" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
@@ -158,20 +159,20 @@
             </property>
         </interface>
 
-        <interface name="IFullTimeEmployee"
+        <interface name="PIFullTimeEmployee"
             identity-type="datastore"/>
 
-        <interface name="IInsurance"
+        <interface name="PIInsurance"
             identity-type="datastore">
         </interface>
 
-        <interface name="IMedicalInsurance"
+        <interface name="PIMedicalInsurance"
             identity-type="datastore"/>
 
-        <interface name="IPartTimeEmployee"
+        <interface name="PIPartTimeEmployee"
             identity-type="datastore"/>
 
-        <interface name="IPerson"
+        <interface name="PIPerson"
             identity-type="datastore">
             <property name="middlename" default-fetch-group="false"/>
             <property name="address"
@@ -182,36 +183,36 @@
             <query name="validNotUnique">
                 SELECT firstname, lastname 
                 INTO org.apache.jdo.tck.query.result.classes.FullName 
-                FROM org.apache.jdo.tck.pc.company.IPerson
+                FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="validUnique">
                 SELECT UNIQUE firstname, lastname 
                 INTO org.apache.jdo.tck.query.result.classes.FullName 
-                FROM org.apache.jdo.tck.pc.company.IPerson 
+                FROM org.apache.jdo.tck.pc.company.PIPerson 
                 WHERE firstname == 'emp1First'
             </query>
             <query name="invalidUnique">
                 SELECT UNIQUE firstname, lastname 
                 INTO org.apache.jdo.tck.query.result.classes.FullName
-                FROM org.apache.jdo.tck.pc.company.IPerson
+                FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="unmodifiable" unmodifiable="true">
                 SELECT firstname, lastname 
-                FROM org.apache.jdo.tck.pc.company.IPerson
+                FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="packageJDO">
-                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+                SELECT FROM org.apache.jdo.tck.pc.company.PIPerson
                 WHERE personid > 1
             </query>
             <query name="changeQuery">
-                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+                SELECT FROM org.apache.jdo.tck.pc.company.PIPerson
             </query>
             <query name="invalidQuery">
-                SeLeCt FrOm org.apache.jdo.tck.pc.company.IPerson
+                SeLeCt FrOm org.apache.jdo.tck.pc.company.PIPerson
             </query>
         </interface>
 
-        <interface name="IProject"
+        <interface name="PIProject"
             identity-type="datastore">
             <property name="reviewers" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>

Modified: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm Tue Jul 17 08:36:42 2007
@@ -188,7 +188,7 @@
             </field>
         </class>
 
-        <interface name="ICompany" table="companies">
+        <interface name="PICompany" table="companies">
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -210,7 +210,7 @@
             <property name="departments" mapped-by="company"/>
         </interface>
 
-        <interface name="IDepartment" table="departments">
+        <interface name="PIDepartment" table="departments">
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>
@@ -222,17 +222,17 @@
             <property name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
         </interface>
 
-        <interface name="IPartTimeEmployee">
+        <interface name="PIPartTimeEmployee">
             <inheritance strategy="superclass-table"/>
             <property name="wage" column="WAGE"/>
         </interface>
 
-        <interface name="IFullTimeEmployee">
+        <interface name="PIFullTimeEmployee">
             <inheritance strategy="superclass-table"/>
             <property name="salary" column="SALARY"/>
         </interface>
 
-        <interface name="IEmployee">
+        <interface name="PIEmployee">
             <inheritance strategy="superclass-table"/>
             <property name="hiredate" column="HIREDATE"/>
             <property name="weeklyhours" column="WEEKLYHOURS"/>
@@ -261,7 +261,7 @@
             <property name="hradvisees" mapped-by="hradvisor"/>
         </interface>
 
-        <interface name="IPerson" table="persons">
+        <interface name="PIPerson" table="persons">
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"
                     indexed="true"/>
@@ -305,7 +305,7 @@
             </query>
         </interface>
 
-        <interface name="IInsurance" table="insuranceplans">
+        <interface name="PIInsurance" table="insuranceplans">
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR">
                     <index name="INS_DISCRIMINATOR_INDEX" unique="false"/>
@@ -318,17 +318,17 @@
             </property>
         </interface>
 
-        <interface name="IDentalInsurance">
+        <interface name="PIDentalInsurance">
             <inheritance strategy="superclass-table"/>
             <property name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
         </interface>
 
-        <interface name="IMedicalInsurance">
+        <interface name="PIMedicalInsurance">
             <inheritance strategy="superclass-table"/>
             <property name="planType" column="PLANTYPE"/>
         </interface>
 
-        <interface name="IProject" table="projects">
+        <interface name="PIProject" table="projects">
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>

Modified: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm Tue Jul 17 08:36:42 2007
@@ -191,7 +191,7 @@
             </field>
         </class>
 
-        <interface name="ICompany" table="companies">
+        <interface name="PICompany" table="companies">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
@@ -214,7 +214,7 @@
             <property name="departments" mapped-by="company"/>
         </interface>
 
-        <interface name="IDepartment" table="departments">
+        <interface name="PIDepartment" table="departments">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
@@ -227,17 +227,17 @@
             <property name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
         </interface>
 
-        <interface name="IPartTimeEmployee">
+        <interface name="PIPartTimeEmployee">
             <inheritance strategy="superclass-table"/>
             <property name="wage" column="WAGE"/>
         </interface>
 
-        <interface name="IFullTimeEmployee">
+        <interface name="PIFullTimeEmployee">
             <inheritance strategy="superclass-table"/>
             <property name="salary" column="SALARY"/>
         </interface>
 
-        <interface name="IEmployee">
+        <interface name="PIEmployee">
             <inheritance strategy="superclass-table"/>
             <property name="hiredate" column="HIREDATE"/>
             <property name="weeklyhours" column="WEEKLYHOURS"/>
@@ -266,7 +266,7 @@
             <property name="hradvisees" mapped-by="hradvisor"/>
         </interface>
 
-        <interface name="IPerson" table="persons">
+        <interface name="PIPerson" table="persons">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"
@@ -311,7 +311,7 @@
             </query>
         </interface>
 
-        <interface name="IInsurance" table="insuranceplans">
+        <interface name="PIInsurance" table="insuranceplans">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR">
@@ -325,17 +325,17 @@
             </property>
         </interface>
 
-        <interface name="IDentalInsurance">
+        <interface name="PIDentalInsurance">
             <inheritance strategy="superclass-table"/>
             <property name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
         </interface>
 
-        <interface name="IMedicalInsurance">
+        <interface name="PIMedicalInsurance">
             <inheritance strategy="superclass-table"/>
             <property name="planType" column="PLANTYPE"/>
         </interface>
 
-        <interface name="IProject" table="projects">
+        <interface name="PIProject" table="projects">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>



Mime
View raw message