Author: clr
Date: Wed Jul 4 14:14:12 2007
New Revision: 553332
URL: http://svn.apache.org/viewvc?view=rev&rev=553332
Log:
JDO-507 Added extends clauses to PI so they can implement the domain interfaces
Modified:
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/PIDentalInsurance.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/PIMedicalInsurance.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
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=553332&r1=553331&r2=553332
==============================================================================
--- 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 Wed
Jul 4 14:14:12 2007
@@ -19,13 +19,15 @@
import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IAddress;
+
/**
* This interface represents the persistent state of Address.
* Javadoc was deliberately omitted because it would distract from
* the purpose of the interface.
*/
@PersistenceCapable(embeddedOnly="true", requiresExtent="false")
-public interface PIAddress {
+public interface PIAddress extends IAddress {
@Property(primaryKey="true")
long getAddrid();
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=553332&r1=553331&r2=553332
==============================================================================
--- 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 Wed
Jul 4 14:14:12 2007
@@ -22,6 +22,8 @@
import java.util.Date;
import java.util.Set;
+import org.apache.jdo.tck.pc.company.ICompany;
+
/**
* This interface represents the persistent state of Company.
* Javadoc was deliberately omitted because it would distract from
@@ -31,7 +33,7 @@
@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
column="DISCRIMINATOR")
-public interface PICompany {
+public interface PICompany extends ICompany {
@Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
@Embedded(nullIndicatorColumn="COUNTRY",
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDentalInsurance.java?view=diff&rev=553332&r1=553331&r2=553332
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDentalInsurance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDentalInsurance.java
Wed Jul 4 14:14:12 2007
@@ -21,13 +21,15 @@
import java.math.BigDecimal;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+
/**
* This interface represents the persistent state of DentalInsurance.
* Javadoc was deliberately omitted because it would distract from
* the purpose of the interface.
*/
@PersistenceCapable(identityType=IdentityType.APPLICATION)
-public interface PIDentalInsurance extends PIInsurance {
+public interface PIDentalInsurance extends PIInsurance, IDentalInsurance {
@Column(name="LIFETIME_ORTHO_BENEFIT")
BigDecimal getLifetimeOrthoBenefit();
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=553332&r1=553331&r2=553332
==============================================================================
--- 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
Wed Jul 4 14:14:12 2007
@@ -21,6 +21,8 @@
import java.util.Set;
+import org.apache.jdo.tck.pc.company.IDepartment;
+
/**
* This interface represents the persistent state of Department.
* Javadoc was deliberately omitted because it would distract from
@@ -31,7 +33,7 @@
@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
column="DISCRIMINATOR")
-public interface PIDepartment {
+public interface PIDepartment extends IDepartment {
@Property(primaryKey="true")
@Column(name="ID")
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=553332&r1=553331&r2=553332
==============================================================================
--- 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 Wed
Jul 4 14:14:12 2007
@@ -22,6 +22,8 @@
import java.util.Date;
import java.util.Set;
+import org.apache.jdo.tck.pc.company.IEmployee;
+
/**
* This interface represents the persistent state of Employee.
* Javadoc was deliberately omitted because it would distract from
@@ -29,7 +31,7 @@
*/
@PersistenceCapable(identityType=IdentityType.APPLICATION)
@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIEmployee extends PIPerson {
+public interface PIEmployee extends PIPerson, IEmployee {
@Column(name="HIREDATE")
Date getHiredate();
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=553332&r1=553331&r2=553332
==============================================================================
--- 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
Wed Jul 4 14:14:12 2007
@@ -19,6 +19,8 @@
import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IInsurance;
+
/**
* This interface represents the persistent state of Insurance.
* Javadoc was deliberately omitted because it would distract from
@@ -30,7 +32,7 @@
column="DISCRIMINATOR", indexed="true")
@Index(name="INS_DISCRIMINATOR_INDEX", unique="false",
columns=@Column(name="DISCRIMINATOR"))
- public interface PIInsurance {
+ public interface PIInsurance extends IInsurance {
@Property(primaryKey="true")
@Column(name="INSID")
Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIMedicalInsurance.java?view=diff&rev=553332&r1=553331&r2=553332
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIMedicalInsurance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIMedicalInsurance.java
Wed Jul 4 14:14:12 2007
@@ -19,13 +19,15 @@
import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+
/**
* This interface represents the persistent state of MedicalInsurance.
* Javadoc was deliberately omitted because it would distract from
* the purpose of the interface.
*/
@PersistenceCapable(identityType=IdentityType.APPLICATION)
-public interface PIMedicalInsurance extends PIInsurance{
+public interface PIMedicalInsurance extends PIInsurance, IMedicalInsurance {
@Column(name="PLANTYPE")
String getPlanType();
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=553332&r1=553331&r2=553332
==============================================================================
--- 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 Wed
Jul 4 14:14:12 2007
@@ -22,6 +22,8 @@
import java.util.Date;
import java.util.Map;
+import org.apache.jdo.tck.pc.company.IPerson;
+
/**
* This interface represents the persistent state of Person.
* Javadoc was deliberately omitted because it would distract from
@@ -31,7 +33,7 @@
@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
column="DISCRIMINATOR", indexed="true")
-public interface PIPerson {
+public interface PIPerson extends IPerson {
@Property(primaryKey="true")
@Column(name="PERSONID")
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=553332&r1=553331&r2=553332
==============================================================================
--- 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 Wed
Jul 4 14:14:12 2007
@@ -21,6 +21,8 @@
import java.math.BigDecimal;
import java.util.Set;
+import org.apache.jdo.tck.pc.company.IProject;
+
/**
* This interface represents the persistent state of Project.
* Javadoc was deliberately omitted because it would distract from
@@ -30,7 +32,7 @@
@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
column="DISCRIMINATOR")
-public interface PIProject {
+public interface PIProject extends IProject {
@Property(primaryKey="true")
@Column(name="PROJID")
|