db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r561082 - in /db/jdo/trunk/tck2/src: java/org/apache/jdo/tck/pc/companyAnnotatedPI/ jdo/applicationidentity/org/apache/jdo/tck/pc/company/ jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ sql/derby/applicationidentity/ sql/derby/datasto...
Date Mon, 30 Jul 2007 18:21:56 GMT
Author: mcaisse
Date: Mon Jul 30 11:21:54 2007
New Revision: 561082

URL: http://svn.apache.org/viewvc?view=rev&rev=561082
Log:
JDO-503 patches provided by Andy

Modified:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
    db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck2/src/sql/derby/datastoreidentity/schema.sql

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
Mon Jul 30 11:21:54 2007
@@ -50,7 +50,7 @@
     @PrimaryKey
     @Column(name="ID")
     long getCompanyid();
-    @Persistent
+    @Persistent(mappedBy="company")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
     Set getDepartments();
     @Column(name="FOUNDEDDATE")

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
Mon Jul 30 11:21:54 2007
@@ -42,8 +42,10 @@
     long getDeptid();
     @Column(name="NAME")
     String getName();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppCompany.class)
     @Column(name="COMPANYID")
     ICompany getCompany();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     @Column(name="EMP_OF_THE_MONTH")
     IEmployee getEmployeeOfTheMonth();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT, 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
Mon Jul 30 11:21:54 2007
@@ -49,27 +49,32 @@
             mappedBy="members")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
     Set getProjects();
-    @Persistent(mappedBy="employee")
+    @Persistent(mappedBy="employee", types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDentalInsurance.class)
     IDentalInsurance getDentalInsurance();
-    @Persistent(mappedBy="employee")
+    @Persistent(mappedBy="employee", types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppMedicalInsurance.class)
     IMedicalInsurance getMedicalInsurance();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
     @Column(name="DEPARTMENT")
     IDepartment getDepartment();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
     @Column(name="FUNDINGDEPT")
     IDepartment getFundingDept();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     @Column(name="MANAGER")
     IEmployee getManager();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="manager")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getTeam();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     @Column(name="MENTOR")
     IEmployee getMentor();
-    @Persistent(mappedBy="mentor")
+    @Persistent(mappedBy="mentor", types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     IEmployee getProtege();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     @Column(name="HRADVISOR")
     IEmployee getHradvisor();
-    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT)
+    @Persistent(mappedBy="hradvisor", persistenceModifier=PersistenceModifier.PERSISTENT)
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getHradvisees();
     

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
Mon Jul 30 11:21:54 2007
@@ -41,6 +41,7 @@
     long getInsid();
     @Column(name="CARRIER")
     String getCarrier();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     @Column(name="EMPLOYEE")
     IEmployee getEmployee();
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java Mon
Jul 30 11:21:54 2007
@@ -63,8 +63,8 @@
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(types=java.lang.String.class)
-    @Value(types=java.lang.String.class)
+    @Key(types=java.lang.String.class, column="TYPE")
+    @Value(types=java.lang.String.class, column="PHONENO")
     Map getPhoneNumbers();
     
     void setPersonid(long personid);

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
Mon Jul 30 11:21:54 2007
@@ -44,26 +44,18 @@
     BigDecimal getBudget();
     @Persistent(table="project_reviewer")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
-            column="REVIEWER")
-    @Join(column="PROJID")
-    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+            column="REVIEWER", foreignKey="PR_REV_FK")
+    @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     Set getReviewers();
     @Persistent(table="project_member")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
-            column="MEMBER")
-    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCAppEmployee.class,
-    //    foreignKey=@ForeignKey(name="PR_REV_FK"))
-    @Join(column="PROJID")
+            column="MEMBER", foreignKey="PM_MEMB_FK")
+    @Join(column="PROJID", foreignKey="PM_PROJ_FK")
     Set getMembers();
     
     void setProjid(long projid);
     void setName(String name);
     void setBudget(BigDecimal budget);
-    @Persistent
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     void setReviewers(Set reviewers);
-    @Persistent
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     void setMembers(Set employees);
-    
 }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java Mon
Jul 30 11:21:54 2007
@@ -38,7 +38,7 @@
         column="DATASTORE_IDENTITY")
 public interface PIDSCompany extends ICompany {
     
-    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
         members={
             @Persistent(name="addrid", columns=@Column(name="ADDRID")),
@@ -51,7 +51,7 @@
     IAddress getAddress();
     @Column(name="ID")
     long getCompanyid();
-    @Persistent
+    @Persistent(mappedBy="company")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
     Set getDepartments();
     @Column(name="FOUNDEDDATE")

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
Mon Jul 30 11:21:54 2007
@@ -42,8 +42,10 @@
     long getDeptid();
     @Column(name="NAME")
     String getName();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSCompany.class)
     @Column(name="COMPANYID")
     ICompany getCompany();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     @Column(name="EMP_OF_THE_MONTH")
     IEmployee getEmployeeOfTheMonth();
     @Persistent(mappedBy="department")

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
Mon Jul 30 11:21:54 2007
@@ -45,26 +45,31 @@
     @Persistent(mappedBy="members")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
     Set getProjects();
-    @Persistent(mappedBy="employee")
+    @Persistent(mappedBy="employee",types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDentalInsurance.class)
     IDentalInsurance getDentalInsurance();
-    @Persistent(mappedBy="employee")
+    @Persistent(mappedBy="employee",types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSMedicalInsurance.class)
     IMedicalInsurance getMedicalInsurance();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
     @Column(name="DEPARTMENT")
     IDepartment getDepartment();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
     @Column(name="FUNDINGDEPT")
     IDepartment getFundingDept();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     @Column(name="MANAGER")
     IEmployee getManager();
     @Persistent(mappedBy="manager")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getTeam();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     @Column(name="MENTOR")
     IEmployee getMentor();
-    @Persistent(mappedBy="mentor")
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class, mappedBy="mentor")
     IEmployee getProtege();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     @Column(name="HRADVISOR")
     IEmployee getHradvisor();
-    @Persistent
+    @Persistent(mappedBy="hradvisor")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getHradvisees();
     

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
Mon Jul 30 11:21:54 2007
@@ -41,6 +41,7 @@
     long getInsid();
     @Column(name="CARRIER")
     String getCarrier();
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     @Column(name="EMPLOYEE")
     IEmployee getEmployee();
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java Mon
Jul 30 11:21:54 2007
@@ -47,7 +47,7 @@
     @Persistent(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
-    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
         members={
             @Persistent(name="addrid", columns=@Column(name="ADDRID")),
@@ -61,8 +61,8 @@
     Date getBirthdate();
     @Persistent(table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(types=java.lang.String.class)
-    @Value(types=java.lang.String.class)
+    @Key(types=java.lang.String.class, column="TYPE")
+    @Value(types=java.lang.String.class, column="PHONENO")
     Map getPhoneNumbers();
     
     void setPersonid(long personid);

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java Mon
Jul 30 11:21:54 2007
@@ -42,15 +42,15 @@
     String getName();
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     BigDecimal getBudget();
-    @Persistent
+    @Persistent(table="project_reviewer")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
             column="REVIEWER", foreignKey="PR_REV_FK")
-    @Join(column="PROJID", table="proj_reviewer", foreignKey="PR_PROJ_FK")
+    @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     Set getReviewers();
-    @Persistent
+    @Persistent(table="project_member")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
             column="MEMBER", foreignKey="PM_MEMB_FK")
-    @Join(column="PROJID", table="proj_member", foreignKey="PM_PROJ_FK")
+    @Join(column="PROJID", foreignKey="PM_PROJ_FK")
     Set getMembers();
     
     void setProjid(long projid);

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=561082&r1=561081&r2=561082
==============================================================================
--- 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
Mon Jul 30 11:21:54 2007
@@ -165,6 +165,12 @@
         <interface name="PIDepartment"
             identity-type="application">
             <property name="deptid" primary-key="true"/>
+            <property name="company"
+                   field-type="org.apache.jdo.tck.pc.company.PICompany"
+                   persistence-modifier="persistent"/>
+            <property name="employeeOfTheMonth"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
             <property name="employees" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
@@ -175,6 +181,30 @@
 
         <interface name="PIEmployee"
             identity-type="application">
+            <property name="dentalInsurance"
+                   field-type="org.apache.jdo.tck.pc.company.PIDentalInsurance"
+                   persistence-modifier="persistent"/>
+            <property name="medicalInsurance"
+                   field-type="org.apache.jdo.tck.pc.company.PIMedicalInsurance"
+                   persistence-modifier="persistent"/>
+            <property name="department"
+                   field-type="org.apache.jdo.tck.pc.company.PIDepartment"
+                   persistence-modifier="persistent"/>
+            <property name="fundingDept"
+                   field-type="org.apache.jdo.tck.pc.company.PIDepartment"
+                   persistence-modifier="persistent"/>
+            <property name="manager"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
+            <property name="mentor"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
+            <property name="protege"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
+            <property name="hradvisor"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
             <property name="reviewedProjects" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
@@ -194,6 +224,9 @@
 
         <interface name="PIInsurance"
             identity-type="application">
+            <property name="employee"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
             <property name="insid" primary-key="true"/>
         </interface>
 

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=561082&r1=561081&r2=561082
==============================================================================
--- 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
Mon Jul 30 11:21:54 2007
@@ -137,6 +137,9 @@
 
         <interface name="PIDepartment"
             identity-type="datastore">
+            <property name="employeeOfTheMonth"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
             <property name="company"
                    field-type="org.apache.jdo.tck.pc.company.PICompany"
                    persistence-modifier="persistent"/>

Modified: db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql Mon Jul 30 11:21:54 2007
@@ -275,7 +275,7 @@
     HRADVISOR INTEGER,
     SALARY REAL,
     WAGE REAL,
-    DISCRIMINATOR varchar(64) NOT NULL,
+    DISCRIMINATOR varchar(255) NOT NULL,
     CONSTRAINT PERS_DEPT_FK FOREIGN KEY (DEPARTMENT) REFERENCES departments,
     CONSTRAINT PERS_FUNDDEPT_FK FOREIGN KEY (FUNDINGDEPT) REFERENCES departments,
     CONSTRAINT PERS_MANAGER_FK FOREIGN KEY (MANAGER) REFERENCES persons,
@@ -289,7 +289,7 @@
     CARRIER VARCHAR(64) NOT NULL,
     LIFETIME_ORTHO_BENEFIT DECIMAL(22,3),
     PLANTYPE VARCHAR(8),
-    DISCRIMINATOR varchar(64) NOT NULL,
+    DISCRIMINATOR varchar(255) NOT NULL,
     EMPLOYEE INTEGER,
     CONSTRAINT INS_EMP_FK FOREIGN KEY (EMPLOYEE) REFERENCES persons,
     CONSTRAINT INS_PK PRIMARY KEY (INSID)

Modified: db/jdo/trunk/tck2/src/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/sql/derby/datastoreidentity/schema.sql?view=diff&rev=561082&r1=561081&r2=561082
==============================================================================
--- db/jdo/trunk/tck2/src/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck2/src/sql/derby/datastoreidentity/schema.sql Mon Jul 30 11:21:54 2007
@@ -205,7 +205,7 @@
     HRADVISOR INTEGER,
     SALARY REAL,
     WAGE REAL,
-    DISCRIMINATOR varchar(64) NOT NULL,
+    DISCRIMINATOR varchar(255) NOT NULL,
     CONSTRAINT PERS_DEPT_FK FOREIGN KEY (DEPARTMENT) REFERENCES departments,
     CONSTRAINT PERS_FUNDDEPT_FK FOREIGN KEY (FUNDINGDEPT) REFERENCES departments,
     CONSTRAINT PERS_MANAGER_FK FOREIGN KEY (MANAGER) REFERENCES persons,
@@ -221,7 +221,7 @@
     CARRIER VARCHAR(64) NOT NULL,
     LIFETIME_ORTHO_BENEFIT DECIMAL(22,3),
     PLANTYPE VARCHAR(8),
-    DISCRIMINATOR varchar(64) NOT NULL,
+    DISCRIMINATOR varchar(255) NOT NULL,
     EMPLOYEE INTEGER,
     CONSTRAINT INS_EMP_FK FOREIGN KEY (EMPLOYEE) REFERENCES persons,
     CONSTRAINT INS_PK PRIMARY KEY (DATASTORE_IDENTITY)



Mime
View raw message