db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r559648 - in /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc: companyAnnotatedFC/ companyAnnotatedPI/
Date Wed, 25 Jul 2007 23:31:23 GMT
Author: clr
Date: Wed Jul 25 16:31:21 2007
New Revision: 559648

URL: http://svn.apache.org/viewvc?view=rev&rev=559648
Log:
JDO-510 Synchronized tck2 with api2 annotations changes

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/FCAppInsurance.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/PIAppAddress.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/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/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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -46,27 +46,27 @@
     public class FCAppCompany 
     implements ICompany, Serializable, Comparable, Comparator, DeepEquality {
 
-    @Field(primaryKey="true")
+    @Persistent(primaryKey="true")
     @Column(name="ID")
     private long        companyid;
     @Column(name="NAME", jdbcType="VARCHAR")
     private String      name;
     @Column(name="FOUNDEDDATE")
     private Date        founded;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     private FCAppAddress     address;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="company")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppDepartment.class)
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -46,7 +46,7 @@
 
     public static final int RECOMMENDED_NO_OF_EMPS = 2;
 
-    @Field(primaryKey="true")
+    @PrimaryKey
     @Column(name="ID")
     private long deptid;
     @Column(name="NAME")
@@ -55,13 +55,11 @@
     private FCAppCompany company;
     @Column(name="EMP_OF_THE_MONTH")
     private FCAppEmployee employeeOfTheMonth;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
-            mappedBy="department")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Persistent(mappedBy="department")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
     private transient Set employees = new HashSet();
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="fundingDept")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Persistent(mappedBy="fundingDept")
     private transient Set fundedEmps = new HashSet();
 
     /** This is the JDO-required no-args constructor. The TCK relies on

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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -45,9 +45,9 @@
     private Date             hiredate;
     @Column(name="WEEKLYHOURS")
     private double           weeklyhours;
-    @Field(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     private FCAppDentalInsurance  dentalInsurance;
-    @Field(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     private FCAppMedicalInsurance medicalInsurance;
     @Column(name="DEPARTMENT")
     private FCAppDepartment       department;
@@ -57,25 +57,21 @@
     private FCAppEmployee         manager;
     @Column(name="MENTOR")
     private FCAppEmployee         mentor;
-    @Field(mappedBy="mentor")
+    @Persistent(mappedBy="mentor")
     private FCAppEmployee         protege;
     @Column(name="HRADVISOR")
     private FCAppEmployee         hradvisor;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="reviewers")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
+    @Persistent(mappedBy="reviewers")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
     private transient Set reviewedProjects = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="members")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
+    @Persistent(mappedBy="members")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppProject.class)
     private transient Set projects = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="manager")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Persistent(mappedBy="manager")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
     private transient Set team = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="hradvisor")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class)
+    @Persistent(mappedBy="hradvisor")
+    @Element(boundTypes=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/FCAppInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java?view=diff&rev=559648&r1=559647&r2=559648
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java Wed Jul 25 16:31:21 2007
@@ -41,7 +41,7 @@
 public class FCAppInsurance 
     implements IInsurance, Serializable, Comparable, Comparator, DeepEquality  {
 
-    @Field(primaryKey="true")
+    @PrimaryKey
     @Column(name="INSID")
     private long     insid;
     @Column(name="CARRIER")

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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -45,35 +45,34 @@
 public class FCAppPerson 
     implements IPerson, Serializable, Comparable, Comparator, DeepEquality  {
 
-    @Field(primaryKey="true")
+    @PrimaryKey
     @Column(name="PERSONID")
     private long    personid;
     @Column(name="FIRSTNAME")
     private String  firstname;
     @Column(name="LASTNAME")
     private String  lastname;
-    @Field(defaultFetchGroup="false")
+    @Persistent(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     private String  middlename;
     private Date    birthdate;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     private FCAppAddress address;
 
     // maps phone number types ("home", "work", "mobile", etc.) 
     // to phone numbers specified as String
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type")
+    @Persistent(table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(types=java.lang.String.class, column="TYPE")
-    @Value(types=java.lang.String.class, column="PHONENO")
+    @Key(boundTypes=java.lang.String.class, column="TYPE")
+    @Value(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -44,27 +44,22 @@
 public class FCAppProject 
     implements IProject, Serializable, Comparable, Comparator, DeepEquality  {
 
-    @Field(primaryKey="true")
+    @PrimaryKey
     @Column(name="PROJID")
     private long projid;
     @Column(name="NAME")
     private String     name;
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     private BigDecimal budget;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="project_reviewer")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Persistent(table="project_reviewer")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="REVIEWER")
-    @Join(column="PROJID")
-    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+    @Join(column="PROJID", foreignKey="PR_PROJ_FK")
     private transient Set reviewers = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.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")
+    @Persistent(table="project_member")
+    @Element(boundTypes=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();
     
     /** This is the JDO-required no-args constructor. The TCK relies on

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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -54,20 +54,20 @@
     private String      name;
     @Column(name="FOUNDEDDATE")
     private Date        founded;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     private FCDSAddress     address;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="company")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSDepartment.class)
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -56,13 +56,11 @@
     private FCDSCompany company;
     @Column(name="EMP_OF_THE_MONTH")
     private FCDSEmployee employeeOfTheMonth;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
-            mappedBy="department")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Persistent(mappedBy="department")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
     private transient Set employees = new HashSet();
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="fundingDept")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Persistent(mappedBy="fundingDept")
     private transient Set fundedEmps = new HashSet();
 
     /** This is the JDO-required no-args constructor. The TCK relies on

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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -44,9 +44,9 @@
     private Date             hiredate;
     @Column(name="WEEKLYHOURS")
     private double           weeklyhours;
-    @Field(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     private FCDSDentalInsurance  dentalInsurance;
-    @Field(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     private FCDSMedicalInsurance medicalInsurance;
     @Column(name="DEPARTMENT")
     private FCDSDepartment       department;
@@ -56,25 +56,21 @@
     private FCDSEmployee         manager;
     @Column(name="MENTOR")
     private FCDSEmployee         mentor;
-    @Field(mappedBy="mentor")
+    @Persistent(mappedBy="mentor")
     private FCDSEmployee         protege;
     @Column(name="HRADVISOR")
     private FCDSEmployee         hradvisor;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="reviewers")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
+    @Persistent(mappedBy="reviewers")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
     private transient Set reviewedProjects = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="members")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
+    @Persistent(mappedBy="members")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSProject.class)
     private transient Set projects = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="manager")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Persistent(mappedBy="manager")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
     private transient Set team = new HashSet();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="hradvisor")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class)
+    @Persistent(mappedBy="hradvisor")
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -53,29 +53,28 @@
     private String  firstname;
     @Column(name="LASTNAME")
     private String  lastname;
-    @Field(defaultFetchGroup="false")
+    @Persistent(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     private String  middlename;
     private Date    birthdate;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     private FCDSAddress address;
 
     // maps phone number types ("home", "work", "mobile", etc.) 
     // to phone numbers specified as String
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="employee_phoneno_type")
+    @Persistent(table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(types=java.lang.String.class, column="TYPE")
-    @Value(types=java.lang.String.class, column="PHONENO")
+    @Key(boundTypes=java.lang.String.class, column="TYPE")
+    @Value(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -51,20 +51,14 @@
     private String     name;
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     private BigDecimal budget;
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="project_reviewer")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
-            column="REVIEWER")
-    @Join(column="PROJID")
-    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+    @Element(boundTypes=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();
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="project_member")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
-            column="MEMBER")
-    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCDSEmployee.class,
-    //    foreignKey=@ForeignKey(name="PR_REV_FK"))
-    @Join(column="PROJID")
+    @Persistent(table="project_member")
+    @Element(boundTypes=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();
 
     /** This is the JDO-required no-args constructor. The TCK relies on

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java?view=diff&rev=559648&r1=559647&r2=559648
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java Wed Jul 25 16:31:21 2007
@@ -29,7 +29,7 @@
 @PersistenceCapable(embeddedOnly="true", requiresExtent="false")
 public interface PIAppAddress extends IAddress {
 
-    @Property(primaryKey="true")
+    @Persistent(primaryKey="true")
     long getAddrid();
     String getStreet();
     String getCity();

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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -36,23 +36,22 @@
         column="DISCRIMINATOR")
 public interface PIAppCompany extends ICompany {
     
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        properties={
-            @Property(name="addrid", columns=@Column(name="ADDRID")),
-            @Property(name="street", columns=@Column(name="STREET")),
-            @Property(name="city", columns=@Column(name="CITY")),
-            @Property(name="state", columns=@Column(name="STATE")),
-            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Property(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
-    @Property(primaryKey="true")
+    @PrimaryKey
     @Column(name="ID")
     long getCompanyid();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
+    @Persistent
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -37,7 +37,7 @@
         column="DISCRIMINATOR")
 public interface PIAppDepartment extends IDepartment {
 
-    @Property(primaryKey="true")
+    @Persistent(primaryKey="true")
     @Column(name="ID")
     long getDeptid();
     @Column(name="NAME")
@@ -46,13 +46,13 @@
     ICompany getCompany();
     @Column(name="EMP_OF_THE_MONTH")
     IEmployee getEmployeeOfTheMonth();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT, 
             mappedBy="department")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getEmployees();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="fundingDept")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -41,17 +41,17 @@
     Date getHiredate();
     @Column(name="WEEKLYHOURS")
     double getWeeklyhours();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="reviewers")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
     Set getReviewedProjects();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="members")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
     Set getProjects();
-    @Property(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     IDentalInsurance getDentalInsurance();
-    @Property(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     IMedicalInsurance getMedicalInsurance();
     @Column(name="DEPARTMENT")
     IDepartment getDepartment();
@@ -59,18 +59,18 @@
     IDepartment getFundingDept();
     @Column(name="MANAGER")
     IEmployee getManager();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             mappedBy="manager")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     Set getTeam();
     @Column(name="MENTOR")
     IEmployee getMentor();
-    @Property(mappedBy="mentor")
+    @Persistent(mappedBy="mentor")
     IEmployee getProtege();
     @Column(name="HRADVISOR")
     IEmployee getHradvisor();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT)
+    @Element(boundTypes=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/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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -36,7 +36,7 @@
         columns=@Column(name="DISCRIMINATOR"))
     public interface PIAppInsurance extends IInsurance {
 
-    @Property(primaryKey="true")
+    @Persistent(primaryKey="true")
     @Column(name="INSID")
     long getInsid();
     @Column(name="CARRIER")

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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -37,34 +37,34 @@
         column="DISCRIMINATOR", indexed="true")
 public interface PIAppPerson extends IPerson {
 
-    @Property(primaryKey="true")
+    @Persistent(primaryKey="true")
     @Column(name="PERSONID")
     long getPersonid();
     @Column(name="LASTNAME")
     String getLastname();
     @Column(name="FIRSTNAME")
     String getFirstname();
-    @Property(defaultFetchGroup="false")
+    @Persistent(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
+            boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        properties={
-            @Property(name="addrid", columns=@Column(name="ADDRID")),
-            @Property(name="street", columns=@Column(name="STREET")),
-            @Property(name="city", columns=@Column(name="CITY")),
-            @Property(name="state", columns=@Column(name="STATE")),
-            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Property(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     Date getBirthdate();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+    @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
             table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(types=java.lang.String.class)
-    @Value(types=java.lang.String.class)
+    @Key(boundTypes=java.lang.String.class)
+    @Value(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -35,25 +35,23 @@
         column="DISCRIMINATOR")
 public interface PIAppProject extends IProject {
 
-    @Property(primaryKey="true")
+    @PrimaryKey
     @Column(name="PROJID")
     long getProjid();
     @Column(name="NAME")
     String getName();
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     BigDecimal getBudget();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="project_reviewer")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Persistent(table="project_reviewer")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="REVIEWER")
     @Join(column="PROJID")
     //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
     Set getReviewers();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="project_member")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+    @Persistent(table="project_member")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
             column="MEMBER")
-    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCAppEmployee.class,
+    //@Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedApp.FCAppEmployee.class,
     //    foreignKey=@ForeignKey(name="PR_REV_FK"))
     @Join(column="PROJID")
     Set getMembers();
@@ -61,11 +59,11 @@
     void setProjid(long projid);
     void setName(String name);
     void setBudget(BigDecimal budget);
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Persistent
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
     void setReviewers(Set reviewers);
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    @Persistent
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -38,22 +38,21 @@
         column="DATASTORE_IDENTITY")
 public interface PIDSCompany extends ICompany {
     
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        properties={
-            @Property(name="addrid", columns=@Column(name="ADDRID")),
-            @Property(name="street", columns=@Column(name="STREET")),
-            @Property(name="city", columns=@Column(name="CITY")),
-            @Property(name="state", columns=@Column(name="STATE")),
-            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Property(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     @Column(name="ID")
     long getCompanyid();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
+    @Persistent
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -46,13 +46,11 @@
     ICompany getCompany();
     @Column(name="EMP_OF_THE_MONTH")
     IEmployee getEmployeeOfTheMonth();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
-            mappedBy="department")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Persistent(mappedBy="department")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getEmployees();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="fundingDept")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Persistent(mappedBy="fundingDept")
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -39,17 +39,15 @@
     Date getHiredate();
     @Column(name="WEEKLYHOURS")
     double getWeeklyhours();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="reviewers")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
+    @Persistent(mappedBy="reviewers")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
     Set getReviewedProjects();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="members")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
+    @Persistent(mappedBy="members")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
     Set getProjects();
-    @Property(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     IDentalInsurance getDentalInsurance();
-    @Property(mappedBy="employee")
+    @Persistent(mappedBy="employee")
     IMedicalInsurance getMedicalInsurance();
     @Column(name="DEPARTMENT")
     IDepartment getDepartment();
@@ -57,18 +55,17 @@
     IDepartment getFundingDept();
     @Column(name="MANAGER")
     IEmployee getManager();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            mappedBy="manager")
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Persistent(mappedBy="manager")
+    @Element(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
     Set getTeam();
     @Column(name="MENTOR")
     IEmployee getMentor();
-    @Property(mappedBy="mentor")
+    @Persistent(mappedBy="mentor")
     IEmployee getProtege();
     @Column(name="HRADVISOR")
     IEmployee getHradvisor();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    @Persistent
+    @Element(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -44,26 +44,25 @@
     String getLastname();
     @Column(name="FIRSTNAME")
     String getFirstname();
-    @Property(defaultFetchGroup="false")
+    @Persistent(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
+    @Persistent(boundTypes=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        properties={
-            @Property(name="addrid", columns=@Column(name="ADDRID")),
-            @Property(name="street", columns=@Column(name="STREET")),
-            @Property(name="city", columns=@Column(name="CITY")),
-            @Property(name="state", columns=@Column(name="STATE")),
-            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Property(name="country", columns=@Column(name="COUNTRY"))
+        members={
+            @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+            @Persistent(name="street", columns=@Column(name="STREET")),
+            @Persistent(name="city", columns=@Column(name="CITY")),
+            @Persistent(name="state", columns=@Column(name="STATE")),
+            @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Persistent(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     Date getBirthdate();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type")
+    @Persistent(table="employee_phoneno_type")
     @Join(column="EMPID")
-    @Key(types=java.lang.String.class)
-    @Value(types=java.lang.String.class)
+    @Key(boundTypes=java.lang.String.class)
+    @Value(boundTypes=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=559648&r1=559647&r2=559648
==============================================================================
--- 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 Wed Jul 25 16:31:21 2007
@@ -42,18 +42,15 @@
     String getName();
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     BigDecimal getBudget();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
-            column="REVIEWER")
-    @Join(column="PROJID", table="proj_reviewer")
-    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+    @Persistent
+    @Element(boundTypes=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();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
-    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
-            column="MEMBER")
-    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIDSEmployee.class,
-    //    foreignKey=@ForeignKey(name="PR_REV_FK"))
-    @Join(column="PROJID", table="proj_member")
+    @Persistent
+    @Element(boundTypes=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();
     
     void setProjid(long projid);



Mime
View raw message