db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r559906 - in /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc: companyAnnotatedFC/ companyAnnotatedPI/
Date Thu, 26 Jul 2007 17:54:48 GMT
Author: clr
Date: Thu Jul 26 10:54:40 2007
New Revision: 559906

URL: http://svn.apache.org/viewvc?view=rev&rev=559906
Log:
JDO-510 Changed boundTypes to types in @Persistent, @Element, @Key, and @Value

Modified:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
    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/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/PIDSPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
Thu Jul 26 10:54:40 2007
@@ -66,7 +66,7 @@
     private FCAppAddress     address;
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="company")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppDepartment.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppDepartment.class)
     private transient Set departments = new HashSet();
 
     protected static SimpleDateFormat formatter =

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
Thu Jul 26 10:54:40 2007
@@ -56,9 +56,9 @@
     @Column(name="EMP_OF_THE_MONTH")
     private FCAppEmployee employeeOfTheMonth;
     @Persistent(mappedBy="department")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
     private transient Set employees = new HashSet();
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
     @Persistent(mappedBy="fundingDept")
     private transient Set fundedEmps = new HashSet();
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
Thu Jul 26 10:54:40 2007
@@ -62,16 +62,16 @@
     @Column(name="HRADVISOR")
     private FCAppEmployee         hradvisor;
     @Persistent(mappedBy="reviewers")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
     private transient Set reviewedProjects = new HashSet();
     @Persistent(mappedBy="members")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
     private transient Set projects = new HashSet();
     @Persistent(mappedBy="manager")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
     private transient Set team = new HashSet();
     @Persistent(mappedBy="hradvisor")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
     private transient Set hradvisees = new HashSet();
 
     /** This is the JDO-required no-args constructor */

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java Thu
Jul 26 10:54:40 2007
@@ -71,8 +71,8 @@
     // to phone numbers specified as String
     @Persistent(table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(boundTypes=java.lang.String.class, column="TYPE")
-    @Value(boundTypes=java.lang.String.class, column="PHONENO")
+    @Key(types=java.lang.String.class, column="TYPE")
+    @Value(types=java.lang.String.class, column="PHONENO")
     private Map phoneNumbers = new HashMap();
     
     protected static SimpleDateFormat formatter =

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
Thu Jul 26 10:54:40 2007
@@ -52,12 +52,12 @@
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     private BigDecimal budget;
     @Persistent(table="project_reviewer")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="REVIEWER")
     @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     private transient Set reviewers = new HashSet();
     @Persistent(table="project_member")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="MEMBER", foreignKey="PR_MEMB_FK")
     @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     private transient Set members = new HashSet();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java Thu
Jul 26 10:54:40 2007
@@ -67,7 +67,7 @@
     private FCDSAddress     address;
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="company")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSDepartment.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSDepartment.class)
     private transient Set departments = new HashSet();
 
     protected static SimpleDateFormat formatter =

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
Thu Jul 26 10:54:40 2007
@@ -57,9 +57,9 @@
     @Column(name="EMP_OF_THE_MONTH")
     private FCDSEmployee employeeOfTheMonth;
     @Persistent(mappedBy="department")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
     private transient Set employees = new HashSet();
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
     @Persistent(mappedBy="fundingDept")
     private transient Set fundedEmps = new HashSet();
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
Thu Jul 26 10:54:40 2007
@@ -61,16 +61,16 @@
     @Column(name="HRADVISOR")
     private FCDSEmployee         hradvisor;
     @Persistent(mappedBy="reviewers")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
     private transient Set reviewedProjects = new HashSet();
     @Persistent(mappedBy="members")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
     private transient Set projects = new HashSet();
     @Persistent(mappedBy="manager")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
     private transient Set team = new HashSet();
     @Persistent(mappedBy="hradvisor")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
     private transient Set hradvisees = new HashSet();
 
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java Thu
Jul 26 10:54:40 2007
@@ -73,8 +73,8 @@
     // to phone numbers specified as String
     @Persistent(table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(boundTypes=java.lang.String.class, column="TYPE")
-    @Value(boundTypes=java.lang.String.class, column="PHONENO")
+    @Key(types=java.lang.String.class, column="TYPE")
+    @Value(types=java.lang.String.class, column="PHONENO")
     private Map phoneNumbers = new HashMap();
     
     protected static SimpleDateFormat formatter =

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java?view=diff&rev=559906&r1=559905&r2=559906
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java Thu
Jul 26 10:54:40 2007
@@ -51,12 +51,12 @@
     private String     name;
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     private BigDecimal budget;
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
             column="REVIEWER", foreignKey="PR_REV_FK")
     @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     private transient Set reviewers = new HashSet();
     @Persistent(table="project_member")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
             column="MEMBER", foreignKey="PR_MEMB_FK")
     @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     private transient Set members = new HashSet();

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=559906&r1=559905&r2=559906
==============================================================================
--- 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
Thu Jul 26 10:54:40 2007
@@ -36,7 +36,7 @@
         column="DISCRIMINATOR")
 public interface PIAppCompany extends ICompany {
     
-    @Persistent(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
         members={
             @Persistent(name="addrid", columns=@Column(name="ADDRID")),
@@ -51,7 +51,7 @@
     @Column(name="ID")
     long getCompanyid();
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
     Set getDepartments();
     @Column(name="FOUNDEDDATE")
     Date getFounded();

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=559906&r1=559905&r2=559906
==============================================================================
--- 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
Thu Jul 26 10:54:40 2007
@@ -48,11 +48,11 @@
     IEmployee getEmployeeOfTheMonth();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT, 
             mappedBy="department")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getEmployees();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="fundingDept")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getFundedEmps();
     
     void setDeptid(long deptid);

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=559906&r1=559905&r2=559906
==============================================================================
--- 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
Thu Jul 26 10:54:40 2007
@@ -43,11 +43,11 @@
     double getWeeklyhours();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="reviewers")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
     Set getReviewedProjects();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="members")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
     Set getProjects();
     @Persistent(mappedBy="employee")
     IDentalInsurance getDentalInsurance();
@@ -61,7 +61,7 @@
     IEmployee getManager();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="manager")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getTeam();
     @Column(name="MENTOR")
     IEmployee getMentor();
@@ -70,7 +70,7 @@
     @Column(name="HRADVISOR")
     IEmployee getHradvisor();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT)
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getHradvisees();
     
     void setHiredate(Date hiredate);

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=559906&r1=559905&r2=559906
==============================================================================
--- 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 Thu
Jul 26 10:54:40 2007
@@ -48,7 +48,7 @@
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
-            boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+            types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
         members={
             @Persistent(name="addrid", columns=@Column(name="ADDRID")),
@@ -63,8 +63,8 @@
     @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(boundTypes=java.lang.String.class)
-    @Value(boundTypes=java.lang.String.class)
+    @Key(types=java.lang.String.class)
+    @Value(types=java.lang.String.class)
     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=559906&r1=559905&r2=559906
==============================================================================
--- 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
Thu Jul 26 10:54:40 2007
@@ -43,15 +43,15 @@
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     BigDecimal getBudget();
     @Persistent(table="project_reviewer")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="REVIEWER")
     @Join(column="PROJID")
     //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
     Set getReviewers();
     @Persistent(table="project_member")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="MEMBER")
-    //@Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedApp.FCAppEmployee.class,
+    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCAppEmployee.class,
     //    foreignKey=@ForeignKey(name="PR_REV_FK"))
     @Join(column="PROJID")
     Set getMembers();
@@ -60,10 +60,10 @@
     void setName(String name);
     void setBudget(BigDecimal budget);
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     void setReviewers(Set reviewers);
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @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=559906&r1=559905&r2=559906
==============================================================================
--- 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 Thu
Jul 26 10:54:40 2007
@@ -38,7 +38,7 @@
         column="DATASTORE_IDENTITY")
 public interface PIDSCompany extends ICompany {
     
-    @Persistent(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
         members={
             @Persistent(name="addrid", columns=@Column(name="ADDRID")),
@@ -52,7 +52,7 @@
     @Column(name="ID")
     long getCompanyid();
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
     Set getDepartments();
     @Column(name="FOUNDEDDATE")
     Date getFounded();

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=559906&r1=559905&r2=559906
==============================================================================
--- 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
Thu Jul 26 10:54:40 2007
@@ -47,10 +47,10 @@
     @Column(name="EMP_OF_THE_MONTH")
     IEmployee getEmployeeOfTheMonth();
     @Persistent(mappedBy="department")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getEmployees();
     @Persistent(mappedBy="fundingDept")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getFundedEmps();
     
     void setDeptid(long deptid);

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=559906&r1=559905&r2=559906
==============================================================================
--- 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
Thu Jul 26 10:54:40 2007
@@ -40,10 +40,10 @@
     @Column(name="WEEKLYHOURS")
     double getWeeklyhours();
     @Persistent(mappedBy="reviewers")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
     Set getReviewedProjects();
     @Persistent(mappedBy="members")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
     Set getProjects();
     @Persistent(mappedBy="employee")
     IDentalInsurance getDentalInsurance();
@@ -56,7 +56,7 @@
     @Column(name="MANAGER")
     IEmployee getManager();
     @Persistent(mappedBy="manager")
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getTeam();
     @Column(name="MENTOR")
     IEmployee getMentor();
@@ -65,7 +65,7 @@
     @Column(name="HRADVISOR")
     IEmployee getHradvisor();
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getHradvisees();
     
     void setHiredate(Date hiredate);

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=559906&r1=559905&r2=559906
==============================================================================
--- 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 Thu
Jul 26 10:54:40 2007
@@ -47,7 +47,7 @@
     @Persistent(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
-    @Persistent(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.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(boundTypes=java.lang.String.class)
-    @Value(boundTypes=java.lang.String.class)
+    @Key(types=java.lang.String.class)
+    @Value(types=java.lang.String.class)
     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=559906&r1=559905&r2=559906
==============================================================================
--- 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 Thu
Jul 26 10:54:40 2007
@@ -43,12 +43,12 @@
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     BigDecimal getBudget();
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
+    @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")
     Set getReviewers();
     @Persistent
-    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
+    @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")
     Set getMembers();



Mime
View raw message