You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2007/07/04 04:12:31 UTC
svn commit: r553044 - in /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc:
companyAnnotatedApp/ companyAnnotatedDS/
Author: mcaisse
Date: Tue Jul 3 19:12:30 2007
New Revision: 553044
URL: http://svn.apache.org/viewvc?view=rev&rev=553044
Log:
JDO-503 more annotations changes consistent with updates to api
Modified:
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCEmployee.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIAddress.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIEmployee.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCEmployee.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCEmployee.java Tue Jul 3 19:12:30 2007
@@ -76,7 +76,7 @@
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class)
private transient Set team = new HashSet();
@Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
- mappedBy="hradvisors")
+ mappedBy="hradvisor")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class)
private transient Set hradvisees = new HashSet();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java Tue Jul 3 19:12:30 2007
@@ -53,18 +53,20 @@
private String name;
@Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
private BigDecimal budget;
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ table="proj_reviewer")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
column="REVIEWER")
- @Join(column="PROJID", table="proj_reviewer")
+ @Join(column="PROJID")
//@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
private transient Set reviewers = new HashSet();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ table="proj_member")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
column="MEMBER")
//@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
// foreignKey=@ForeignKey(name="PR_REV_FK"))
- @Join(column="PROJID", table="proj_member")
+ @Join(column="PROJID")
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/companyAnnotatedApp/PIAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIAddress.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIAddress.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIAddress.java Tue Jul 3 19:12:30 2007
@@ -27,7 +27,7 @@
@PersistenceCapable(embeddedOnly="true", requiresExtent="false")
public interface PIAddress {
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
long getAddrid();
String getStreet();
String getCity();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java Tue Jul 3 19:12:30 2007
@@ -34,7 +34,7 @@
column="DISCRIMINATOR")
public interface PICompany {
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Embedded(nullIndicatorColumn="COUNTRY",
fields={
@Field(name="addrid", columns=@Column(name="ADDRID")),
@@ -45,10 +45,10 @@
@Field(name="country", columns=@Column(name="COUNTRY"))
})
PIAddress getAddress();
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
@Column(name="ID")
long getCompanyid();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIDepartment.class)
Set getDepartments();
@Column(name="FOUNDEDDATE")
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java Tue Jul 3 19:12:30 2007
@@ -34,7 +34,7 @@
column="DISCRIMINATOR")
public interface PIDepartment {
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
@Column(name="ID")
long getDeptid();
@Column(name="NAME")
@@ -43,11 +43,11 @@
PICompany getCompany();
@Column(name="EMP_OF_THE_MONTH")
PIEmployee getEmployeeOfTheMonth();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="department")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
Set getEmployees();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="fundingDept")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
Set getFundedEmps();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIEmployee.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIEmployee.java Tue Jul 3 19:12:30 2007
@@ -35,17 +35,17 @@
Date getHiredate();
@Column(name="WEEKLYHOURS")
double getWeeklyhours();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="reviewers")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIProject.class)
Set getReviewedProjects();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="members")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIProject.class)
Set getProjects();
- @Field(mappedBy="employee")
+ @Property(mappedBy="employee")
PIDentalInsurance getDentalInsurance();
- @Field(mappedBy="employee")
+ @Property(mappedBy="employee")
PIMedicalInsurance getMedicalInsurance();
@Column(name="DEPARTMENT")
PIDepartment getDepartment();
@@ -53,17 +53,17 @@
PIDepartment getFundingDept();
@Column(name="MANAGER")
PIEmployee getManager();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="manager")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
Set getTeam();
@Column(name="MENTOR")
PIEmployee getMentor();
- @Field(mappedBy="mentor")
+ @Property(mappedBy="mentor")
PIEmployee getProtege();
@Column(name="HRADVISOR")
PIEmployee getHradvisor();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
Set getHradvisees();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java Tue Jul 3 19:12:30 2007
@@ -33,7 +33,7 @@
columns=@Column(name="DISCRIMINATOR"))
public interface PIInsurance {
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
@Column(name="INSID")
long getInsid();
@Column(name="CARRIER")
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java Tue Jul 3 19:12:30 2007
@@ -34,17 +34,17 @@
column="DISCRIMINATOR", indexed="true")
public interface PIPerson {
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
@Column(name="PERSONID")
long getPersonid();
@Column(name="LASTNAME")
String getLastname();
@Column(name="FIRSTNAME")
String getFirstname();
- @Field(defaultFetchGroup="false")
+ @Property(defaultFetchGroup="false")
@Column(name="MIDDLENAME", allowsNull="true")
String getMiddlename();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Embedded(nullIndicatorColumn="COUNTRY",
fields={
@Field(name="addrid", columns=@Column(name="ADDRID")),
@@ -56,7 +56,7 @@
})
PIAddress getAddress();
Date getBirthdate();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Join(column="EMPID")
@JoinTable(table="employee_phoneno_type")
@Key(types=java.lang.String.class)
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java Tue Jul 3 19:12:30 2007
@@ -33,20 +33,20 @@
column="DISCRIMINATOR")
public interface PIProject {
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
@Column(name="PROJID")
long getProjid();
@Column(name="NAME")
String getName();
@Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
BigDecimal getBudget();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
column="REVIEWER")
@Join(column="PROJID", table="proj_reviewer")
//@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
Set getReviewers();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
column="MEMBER")
//@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
@@ -57,10 +57,10 @@
void setProjid(long projid);
void setName(String name);
void setBudget(BigDecimal budget);
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
void setReviewers(Set reviewers);
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
void setMembers(Set employees);
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCEmployee.java Tue Jul 3 19:12:30 2007
@@ -77,7 +77,7 @@
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class)
private transient Set team = new HashSet();
@Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
- mappedBy="hradvisors")
+ mappedBy="hradvisor")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class)
private transient Set hradvisees = new HashSet();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java Tue Jul 3 19:12:30 2007
@@ -30,7 +30,6 @@
import java.util.HashMap;
import java.util.Map;
-//import org.apache.jdo.tck.pc.company.*;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IPerson;
import org.apache.jdo.tck.util.DeepEquality;
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java Tue Jul 3 19:12:30 2007
@@ -53,18 +53,20 @@
private String name;
@Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
private BigDecimal budget;
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ table="proj_reviewer")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
column="REVIEWER")
- @Join(column="PROJID", table="proj_reviewer")
+ @Join(column="PROJID")
//@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
private transient Set reviewers = new HashSet();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ table="proj_member")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
column="MEMBER")
//@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
// foreignKey=@ForeignKey(name="PR_REV_FK"))
- @Join(column="PROJID", table="proj_member")
+ @Join(column="PROJID")
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/companyAnnotatedDS/PIAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIAddress.java Tue Jul 3 19:12:30 2007
@@ -24,7 +24,7 @@
* Javadoc was deliberately omitted because it would distract from
* the purpose of the interface.
*/
-@PersistenceCapable
+@PersistenceCapable(embeddedOnly="true", requiresExtent="false")
public interface PIAddress {
long getAddrid();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java Tue Jul 3 19:12:30 2007
@@ -34,7 +34,7 @@
column="DISCRIMINATOR")
public interface PICompany {
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Embedded(nullIndicatorColumn="COUNTRY",
fields={
@Field(name="addrid", columns=@Column(name="ADDRID")),
@@ -47,7 +47,7 @@
PIAddress getAddress();
@Column(name="ID")
long getCompanyid();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIDepartment.class)
Set getDepartments();
@Column(name="FOUNDEDDATE")
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java Tue Jul 3 19:12:30 2007
@@ -42,11 +42,11 @@
PICompany getCompany();
@Column(name="EMP_OF_THE_MONTH")
PIEmployee getEmployeeOfTheMonth();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="department")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
Set getEmployees();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="fundingDept")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
Set getFundedEmps();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIEmployee.java Tue Jul 3 19:12:30 2007
@@ -35,17 +35,17 @@
Date getHiredate();
@Column(name="WEEKLYHOURS")
double getWeeklyhours();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="reviewers")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIProject.class)
Set getReviewedProjects();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="members")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIProject.class)
Set getProjects();
- @Field(mappedBy="employee")
+ @Property(mappedBy="employee")
PIDentalInsurance getDentalInsurance();
- @Field(mappedBy="employee")
+ @Property(mappedBy="employee")
PIMedicalInsurance getMedicalInsurance();
@Column(name="DEPARTMENT")
PIDepartment getDepartment();
@@ -53,17 +53,17 @@
PIDepartment getFundingDept();
@Column(name="MANAGER")
PIEmployee getManager();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
mappedBy="manager")
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
Set getTeam();
@Column(name="MENTOR")
PIEmployee getMentor();
- @Field(mappedBy="mentor")
+ @Property(mappedBy="mentor")
PIEmployee getProtege();
@Column(name="HRADVISOR")
PIEmployee getHradvisor();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
Set getHradvisees();
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java Tue Jul 3 19:12:30 2007
@@ -40,10 +40,10 @@
String getLastname();
@Column(name="FIRSTNAME")
String getFirstname();
- @Field(defaultFetchGroup="false")
+ @Property(defaultFetchGroup="false")
@Column(name="MIDDLENAME", allowsNull="true")
String getMiddlename();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Embedded(nullIndicatorColumn="COUNTRY",
fields={
@Field(name="addrid", columns=@Column(name="ADDRID")),
@@ -55,7 +55,7 @@
})
PIAddress getAddress();
Date getBirthdate();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Join(column="EMPID")
@JoinTable(table="employee_phoneno_type")
@Key(types=java.lang.String.class)
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java?view=diff&rev=553044&r1=553043&r2=553044
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java Tue Jul 3 19:12:30 2007
@@ -33,20 +33,20 @@
column="DISCRIMINATOR")
public interface PIProject {
- @Field(primaryKey="true")
+ @Property(primaryKey="true")
@Column(name="PROJID")
long getProjid();
@Column(name="NAME")
String getName();
@Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
BigDecimal getBudget();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
column="REVIEWER")
@Join(column="PROJID", table="proj_reviewer")
//@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
Set getReviewers();
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
column="MEMBER")
//@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class,
@@ -57,10 +57,10 @@
void setProjid(long projid);
void setName(String name);
void setBudget(BigDecimal budget);
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
void setReviewers(Set reviewers);
- @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+ @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIEmployee.class)
void setMembers(Set employees);