db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r553339 - /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/
Date Wed, 04 Jul 2007 21:40:46 GMT
Author: clr
Date: Wed Jul  4 14:40:45 2007
New Revision: 553339

URL: http://svn.apache.org/viewvc?view=rev&rev=553339
Log:
JDO-507 Added extends... so PI interfaces extend company interfaces

Modified:
    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/PIDentalInsurance.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/PIFullTimeEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.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/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=553339&r1=553338&r2=553339
==============================================================================
--- 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 Wed
Jul  4 14:40:45 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 {
 
     long getAddrid();
     String getStreet();

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=553339&r1=553338&r2=553339
==============================================================================
--- 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 Wed
Jul  4 14:40:45 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
@@ -33,7 +35,7 @@
         column="DISCRIMINATOR")
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
         column="DATASTORE_IDENTITY")
-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/companyAnnotatedDS/PIDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java?view=diff&rev=553339&r1=553338&r2=553339
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDentalInsurance.java
Wed Jul  4 14:40:45 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
-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/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=553339&r1=553338&r2=553339
==============================================================================
--- 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
Wed Jul  4 14:40:45 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
@@ -33,7 +35,7 @@
         column="DISCRIMINATOR")
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
         column="DATASTORE_IDENTITY")
-public interface PIDepartment {
+public interface PIDepartment extends IDepartment {
 
     @Column(name="ID")
     long getDeptid();

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=553339&r1=553338&r2=553339
==============================================================================
--- 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 Wed
Jul  4 14:40:45 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
 @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/companyAnnotatedDS/PIFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java?view=diff&rev=553339&r1=553338&r2=553339
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIFullTimeEmployee.java
Wed Jul  4 14:40:45 2007
@@ -19,6 +19,8 @@
 
 import javax.jdo.annotations.*;
 
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+
 /**
  * This interface represents the persistent state of FullTimeEmployee.
  * Javadoc was deliberately omitted because it would distract from
@@ -26,7 +28,7 @@
  */
 @PersistenceCapable
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIFullTimeEmployee extends PIEmployee {
+public interface PIFullTimeEmployee extends PIEmployee, IFullTimeEmployee {
 
     @Column(name="SALARY")
     double getSalary();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java?view=diff&rev=553339&r1=553338&r2=553339
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java Wed
Jul  4 14:40:45 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
@@ -32,7 +34,7 @@
         columns=@Column(name="DISCRIMINATOR"))
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
         column="DATASTORE_IDENTITY")
-    public interface PIInsurance {
+public interface PIInsurance extends IInsurance {
 
     @Column(name="INSID")
     long getInsid();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java?view=diff&rev=553339&r1=553338&r2=553339
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIMedicalInsurance.java
Wed Jul  4 14:40:45 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
-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/companyAnnotatedDS/PIPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java?view=diff&rev=553339&r1=553338&r2=553339
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPartTimeEmployee.java
Wed Jul  4 14:40:45 2007
@@ -19,6 +19,8 @@
 
 import javax.jdo.annotations.*;
 
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+
 /**
  * This interface represents the persistent state of PartTimeEmployee.
  * Javadoc was deliberately omitted because it would distract from
@@ -26,7 +28,7 @@
  */
 @PersistenceCapable
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIPartTimeEmployee extends PIEmployee {
+public interface PIPartTimeEmployee extends PIEmployee, IPartTimeEmployee {
 
     @Column(name="WAGE")
     double getWage();

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=553339&r1=553338&r2=553339
==============================================================================
--- 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 Wed
Jul  4 14:40:45 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
@@ -33,7 +35,7 @@
         column="DISCRIMINATOR", indexed="true")
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
         column="DATASTORE_IDENTITY")
-public interface PIPerson {
+public interface PIPerson extends IPerson {
 
     @Column(name="PERSONID")
     long getPersonid();

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=553339&r1=553338&r2=553339
==============================================================================
--- 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 Wed
Jul  4 14:40:45 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
@@ -32,7 +34,7 @@
         column="DISCRIMINATOR")
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
         column="DATASTORE_IDENTITY")
-public interface PIProject {
+public interface PIProject extends IProject {
 
     @Column(name="PROJID")
     long getProjid();



Mime
View raw message