db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r556949 [1/2] - in /db/jdo/trunk/tck2: ./ src/java/org/apache/jdo/tck/pc/company/ src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/ src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/ src/jdo/applicationidentity/org/apache/jdo/tck/pc/compa...
Date Tue, 17 Jul 2007 15:36:59 GMT
Author: mcaisse
Date: Tue Jul 17 08:36:42 2007
New Revision: 556949

URL: http://svn.apache.org/viewvc?view=rev&rev=556949
Log:
JDO-503 Classes for annotations tests.

Added:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIAddress.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PICompany.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDepartment.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIEmployee.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIInsurance.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPerson.java   (with props)
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIProject.java   (with props)
Modified:
    db/jdo/trunk/tck2/project.properties
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDentalInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java
    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/FCFullTimeEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCMedicalInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPartTimeEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.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/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/PIFullTimeEmployee.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/PIPartTimeEmployee.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/companyAnnotatedDS/FCAddress.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDentalInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.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/FCFullTimeEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCMedicalInsurance.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPartTimeEmployee.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/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
    db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
    db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm

Modified: db/jdo/trunk/tck2/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/project.properties (original)
+++ db/jdo/trunk/tck2/project.properties Tue Jul 17 08:36:42 2007
@@ -109,17 +109,17 @@
     org/apache/jdo/tck/pc/company/MedicalInsurance.java \
     org/apache/jdo/tck/pc/company/PartTimeEmployee.java \
     org/apache/jdo/tck/pc/company/Project.java \
-    org/apache/jdo/tck/pc/company/IAddress.java \
-    org/apache/jdo/tck/pc/company/ICompany.java \
-    org/apache/jdo/tck/pc/company/IDepartment.java \
-    org/apache/jdo/tck/pc/company/IPerson.java \
-    org/apache/jdo/tck/pc/company/IEmployee.java \
-    org/apache/jdo/tck/pc/company/IFullTimeEmployee.java \
-    org/apache/jdo/tck/pc/company/IInsurance.java \
-    org/apache/jdo/tck/pc/company/IDentalInsurance.java \
-    org/apache/jdo/tck/pc/company/IMedicalInsurance.java \
-    org/apache/jdo/tck/pc/company/IPartTimeEmployee.java \
-    org/apache/jdo/tck/pc/company/IProject.java \
+    org/apache/jdo/tck/pc/company/PIAddress.java \
+    org/apache/jdo/tck/pc/company/PICompany.java \
+    org/apache/jdo/tck/pc/company/PIDepartment.java \
+    org/apache/jdo/tck/pc/company/PIPerson.java \
+    org/apache/jdo/tck/pc/company/PIEmployee.java \
+    org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java \
+    org/apache/jdo/tck/pc/company/PIInsurance.java \
+    org/apache/jdo/tck/pc/company/PIDentalInsurance.java \
+    org/apache/jdo/tck/pc/company/PIMedicalInsurance.java \
+    org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java \
+    org/apache/jdo/tck/pc/company/PIProject.java \
     org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.java \
     org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java \
     org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java \
@@ -302,17 +302,17 @@
     org/apache/jdo/tck/pc/company/MedicalInsurance.class \
     org/apache/jdo/tck/pc/company/PartTimeEmployee.class \
     org/apache/jdo/tck/pc/company/Project.class \
-    org/apache/jdo/tck/pc/company/IAddress.class \
-    org/apache/jdo/tck/pc/company/ICompany.class \
-    org/apache/jdo/tck/pc/company/IDepartment.class \
-    org/apache/jdo/tck/pc/company/IPerson.class \
-    org/apache/jdo/tck/pc/company/IEmployee.class \
-    org/apache/jdo/tck/pc/company/IFullTimeEmployee.class \
-    org/apache/jdo/tck/pc/company/IInsurance.class \
-    org/apache/jdo/tck/pc/company/IDentalInsurance.class \
-    org/apache/jdo/tck/pc/company/IMedicalInsurance.class \
-    org/apache/jdo/tck/pc/company/IPartTimeEmployee.class \
-    org/apache/jdo/tck/pc/company/IProject.class \
+    org/apache/jdo/tck/pc/company/PIAddress.class \
+    org/apache/jdo/tck/pc/company/PICompany.class \
+    org/apache/jdo/tck/pc/company/PIDepartment.class \
+    org/apache/jdo/tck/pc/company/PIPerson.class \
+    org/apache/jdo/tck/pc/company/PIEmployee.class \
+    org/apache/jdo/tck/pc/company/PIFullTimeEmployee.class \
+    org/apache/jdo/tck/pc/company/PIInsurance.class \
+    org/apache/jdo/tck/pc/company/PIDentalInsurance.class \
+    org/apache/jdo/tck/pc/company/PIMedicalInsurance.class \
+    org/apache/jdo/tck/pc/company/PIPartTimeEmployee.class \
+    org/apache/jdo/tck/pc/company/PIProject.class \
     org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.class \
     org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.class \
     org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.class \

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java Tue Jul 17 08:36:42 2007
@@ -43,35 +43,35 @@
     }
     
     public IAddress newAddress() {
-        return (IAddress)pm.newInstance(IAddress.class);
+        return pm.newInstance(PIAddress.class);
     }
     
     public ICompany newCompany() {
-        return (ICompany)pm.newInstance(ICompany.class);
+        return pm.newInstance(PICompany.class);
     }
     
     public IDentalInsurance newDentalInsurance() {
-        return (IDentalInsurance)pm.newInstance(IDentalInsurance.class);
+        return pm.newInstance(PIDentalInsurance.class);
     }
     
     public IDepartment newDepartment() {
-        return (IDepartment)pm.newInstance(IDepartment.class);
+        return pm.newInstance(PIDepartment.class);
     }
     
     public IFullTimeEmployee  newFullTimeEmployee() {
-        return (IFullTimeEmployee)pm.newInstance(IFullTimeEmployee.class);
+        return pm.newInstance(PIFullTimeEmployee.class);
     }
     
     public IMedicalInsurance newMedicalInsurance() {
-        return (IMedicalInsurance)pm.newInstance(IMedicalInsurance.class);        
+        return pm.newInstance(PIMedicalInsurance.class);        
     }
     
     public IPartTimeEmployee  newPartTimeEmployee() {
-        return (IPartTimeEmployee)pm.newInstance(IPartTimeEmployee.class);
+        return pm.newInstance(PIPartTimeEmployee.class);
     }
     
     public IProject newProject() {
-        return (IProject)pm.newInstance(IProject.class);
+        return pm.newInstance(PIProject.class);
     }
 
     public Class[] getTearDownClasses() {

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/IMedicalInsurance.java Tue Jul 17 08:36:42 2007
@@ -22,7 +22,7 @@
  * Javadoc was deliberately omitted because it would distract from
  * the purpose of the interface.
  */
-public interface IMedicalInsurance extends IInsurance{
+public interface IMedicalInsurance extends IInsurance {
 
     String getPlanType();
     void setPlanType(String planType);

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIAddress.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIAddress.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIAddress.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.tck.pc.company;
+
+/**
+ * This interface represents the persistent state of Address.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIAddress extends IAddress {
+
+    long getAddrid();
+    String getStreet();
+    String getCity();
+    String getState();
+    String getZipcode();
+    String getCountry();
+    
+    void setAddrid(long addrid);
+    void setStreet(String street);
+    void setCity(String city);
+    void setState(String state);
+    void setZipcode(String zipcode);
+    void setCountry(String country);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIAddress.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PICompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PICompany.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PICompany.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PICompany.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.tck.pc.company;
+
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * This interface represents the persistent state of Company.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PICompany extends ICompany {
+    
+    //temporary for test. No methods should be here
+    IAddress getAddress();
+    long getCompanyid();
+    Set getDepartments();
+    Date getFounded();
+    String getName();
+    
+    void setAddress(IAddress a);
+    void setCompanyid(long id);
+    void setDepartments(Set depts);
+    void setFounded(Date date);
+    void setName(String string);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PICompany.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.tck.pc.company;
+
+import java.math.BigDecimal;
+
+/**
+ * This interface represents the persistent state of DentalInsurance.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIDentalInsurance extends PIInsurance, IDentalInsurance {
+
+    BigDecimal getLifetimeOrthoBenefit();
+    void setLifetimeOrthoBenefit(BigDecimal lifetimeOrthoBenefit);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDentalInsurance.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDepartment.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDepartment.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDepartment.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.company;
+
+import java.util.Set;
+
+/**
+ * This interface represents the persistent state of Department.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIDepartment extends IDepartment {
+
+    long getDeptid();
+    String getName();
+    ICompany getCompany();
+    IEmployee getEmployeeOfTheMonth();
+    Set getEmployees();
+    Set getFundedEmps();
+    
+    void setDeptid(long deptid);
+    void setName(String name);
+    void setCompany(ICompany company);
+    void setEmployeeOfTheMonth(IEmployee employeeOfTheMonth);
+    void setEmployees(Set employees);
+    void setFundedEmps(Set employees);
+
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIDepartment.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIEmployee.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIEmployee.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.company;
+
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * This interface represents the persistent state of Employee.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIEmployee extends PIPerson, IEmployee {
+
+    Date getHiredate();
+    double getWeeklyhours();
+    Set getReviewedProjects();
+    Set getProjects();
+    IDentalInsurance getDentalInsurance();
+    IMedicalInsurance getMedicalInsurance();
+    IDepartment getDepartment();
+    IDepartment getFundingDept();
+    IEmployee getManager();
+    Set getTeam();
+    IEmployee getMentor();
+    IEmployee getProtege();
+    IEmployee getHradvisor();
+    Set getHradvisees();
+    
+    void setHiredate(Date hiredate);
+    void setWeeklyhours(double weeklyhours);
+    void setReviewedProjects(Set reviewedProjects);
+    void setProjects(Set projects);
+    void setDentalInsurance(IDentalInsurance dentalInsurance);
+    void setMedicalInsurance(IMedicalInsurance medicalInsurance);
+    void setDepartment(IDepartment department);
+    void setFundingDept(IDepartment department);
+    void setManager(IEmployee manager);
+    void setTeam(Set team);
+    void setMentor(IEmployee mentor);
+    void setProtege(IEmployee protege);
+    void setHradvisor(IEmployee hradvisor);
+    void setHradvisees(Set hradvisees);
+    
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIEmployee.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.company;
+
+/**
+ * This interface represents the persistent state of FullTimeEmployee.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIFullTimeEmployee extends PIEmployee, IFullTimeEmployee {
+
+    double getSalary();
+    void setSalary(double salary);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIFullTimeEmployee.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIInsurance.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIInsurance.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.company;
+
+/**
+ * This interface represents the persistent state of Insurance.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIInsurance extends IInsurance {
+
+    long getInsid();
+    String getCarrier();
+    IEmployee getEmployee();
+
+    void setInsid(long insid);
+    void setCarrier(String carrier);
+    void setEmployee(IEmployee employee);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIInsurance.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.company;
+
+/**
+ * This interface represents the persistent state of MedicalInsurance.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIMedicalInsurance extends PIInsurance, IMedicalInsurance {
+
+    String getPlanType();
+    void setPlanType(String planType);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIMedicalInsurance.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.tck.pc.company;
+
+/**
+ * This interface represents the persistent state of PartTimeEmployee.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIPartTimeEmployee extends PIEmployee, IPartTimeEmployee {
+
+    double getWage();
+    void setWage(double wage);
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPartTimeEmployee.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPerson.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPerson.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPerson.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.company;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * This interface represents the persistent state of Person.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIPerson extends IPerson {
+
+    long getPersonid();
+    String getLastname();
+    String getFirstname();
+    String getMiddlename();
+    IAddress getAddress();
+    Date getBirthdate();
+    Map getPhoneNumbers();
+    
+    void setPersonid(long personid);
+    void setLastname(String lastname);
+    void setFirstname(String firstname);
+    void setMiddlename(String middlename);
+    void setAddress(IAddress address);
+    void setBirthdate(Date birthdate);
+    void setPhoneNumbers(Map phoneNumbers);
+
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIPerson.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIProject.java?view=auto&rev=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIProject.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIProject.java Tue Jul 17 08:36:42 2007
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+package org.apache.jdo.tck.pc.company;
+
+import java.math.BigDecimal;
+import java.util.Set;
+
+/**
+ * This interface represents the persistent state of Project.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIProject extends IProject {
+
+    long getProjid();
+    String getName();
+    BigDecimal getBudget();
+    Set getReviewers();
+    Set getMembers();
+    
+    void setProjid(long projid);
+    void setName(String name);
+    void setBudget(BigDecimal budget);
+    void setReviewers(Set reviewers);
+    void setMembers(Set employees);
+    
+}

Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/PIProject.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCAddress.java Tue Jul 17 08:36:42 2007
@@ -30,7 +30,6 @@
  * This class represents a postal address.
  */
 @PersistenceCapable(embeddedOnly="true", requiresExtent="false")
-@Implements ("org.apache.jdo.tck.pc.company.IAddress")
 public class FCAddress 
     implements IAddress, Serializable, Comparable, Comparator, DeepEquality {
 
@@ -200,7 +199,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IAddress otherAddress = (IAddress)other;
+        FCAddress otherAddress = (FCAddress)other;
         String where = "Address<" + addrid + ">";
         return
             helper.equals(addrid, otherAddress.getAddrid(), where + ".addrid") &
@@ -222,14 +221,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IAddress)o);
+        return compareTo((FCAddress)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IAddress)o1, (IAddress)o2);
+        return compare((FCAddress)o1, (FCAddress)o2);
     }
 
     /** 
@@ -242,20 +241,20 @@
      * object is less than, equal to, or greater than the specified Address
      * object. 
      */
-    public int compareTo(IAddress other) {
+    public int compareTo(FCAddress other) {
         return compare(this, other);
     }
     
     /**
-     * Compares its two IAddress arguments for order. Returns a negative
+     * Compares its two FCAddress arguments for order. Returns a negative
      * integer, zero, or a positive integer as the first argument is less
      * than, equal to, or greater than the second. 
-     * @param o1 the first IAddress object to be compared. 
-     * @param o2 the second IAddress object to be compared. 
+     * @param o1 the first FCAddress object to be compared. 
+     * @param o2 the second FCAddress object to be compared. 
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IAddress o1, IAddress o2) {
+    public static int compare(FCAddress o1, FCAddress o2) {
         return EqualityHelper.compare(o1.getAddrid(), o2.getAddrid());
     }
 
@@ -266,8 +265,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IAddress) {
-            return compareTo((IAddress)obj) == 0;
+        if (obj instanceof FCAddress) {
+            return compareTo((FCAddress)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java Tue Jul 17 08:36:42 2007
@@ -30,9 +30,9 @@
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Date;
+import org.apache.jdo.tck.pc.company.IAddress;
 
 import org.apache.jdo.tck.pc.company.ICompany;
-import org.apache.jdo.tck.pc.company.IAddress;
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -40,7 +40,6 @@
  * This class represents information about a company.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION,table="companies")
-@Implements ("org.apache.jdo.tck.pc.company.ICompany")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -246,7 +245,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        ICompany otherCompany = (ICompany)other;
+        FCCompany otherCompany = (FCCompany)other;
         String where = "Company<" + companyid + ">";
         return 
             helper.equals(companyid, otherCompany.getCompanyid(), where + ".companyid") &
@@ -267,14 +266,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((ICompany)o);
+        return compareTo((FCCompany)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((ICompany)o1, (ICompany)o2);
+        return compare((FCCompany)o1, (FCCompany)o2);
     }
 
     /** 
@@ -287,7 +286,7 @@
      * object is less than, equal to, or greater than the specified Company
      * object. 
      */
-    public int compareTo(ICompany other) {
+    public int compareTo(FCCompany other) {
         return compare(this, other);
     }
 
@@ -300,7 +299,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(ICompany o1, ICompany o2) {
+    public static int compare(FCCompany o1, FCCompany o2) {
         return EqualityHelper.compare(o1.getCompanyid(), o2.getCompanyid());
     }
     
@@ -311,8 +310,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof ICompany) {
-            return compareTo((ICompany)obj) == 0;
+        if (obj instanceof FCCompany) {
+            return compareTo((FCCompany)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDentalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDentalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDentalInsurance.java Tue Jul 17 08:36:42 2007
@@ -23,7 +23,6 @@
 
 import org.apache.jdo.tck.pc.company.IDentalInsurance;
 import org.apache.jdo.tck.pc.company.IEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
@@ -31,7 +30,6 @@
  * particular <code>Employee</code>.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Implements ("org.apache.jdo.tck.pc.company.IDentalInsurance")
 public class FCDentalInsurance extends FCInsurance implements IDentalInsurance {
 
     @Column(name="LIFETIME_ORTHO_BENEFIT")
@@ -117,7 +115,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IDentalInsurance otherIns = (IDentalInsurance)other;
+        FCDentalInsurance otherIns = (FCDentalInsurance)other;
         String where = "FCDentalInsurance<" + getInsid() + ">";
         return super.deepCompareFields(otherIns, helper) &
             helper.equals(lifetimeOrthoBenefit, 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java Tue Jul 17 08:36:42 2007
@@ -27,8 +27,8 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.jdo.tck.pc.company.ICompany;
+
 import org.apache.jdo.tck.pc.company.IDepartment;
 import org.apache.jdo.tck.pc.company.IEmployee;
 import org.apache.jdo.tck.util.DeepEquality;
@@ -38,7 +38,6 @@
  * This class represents a department within a company.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION, table="departments")
-@Implements ("org.apache.jdo.tck.pc.company.IDepartment")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -268,7 +267,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IDepartment otherDept = (IDepartment)other;
+        FCDepartment otherDept = (FCDepartment)other;
         String where = "FCDepartment<" + deptid + ">";
         return 
             helper.equals(deptid, otherDept.getDeptid(), where + ".deptid") & 
@@ -309,14 +308,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IDepartment)o);
+        return compareTo((FCDepartment)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IDepartment)o1, (IDepartment)o2);
+        return compare((FCDepartment)o1, (FCDepartment)o2);
     }
 
     /** 
@@ -329,7 +328,7 @@
      * object is less than, equal to, or greater than the specified
      * Department object. 
      */
-    public int compareTo(IDepartment other) {
+    public int compareTo(FCDepartment other) {
         return compare(this, other);
     }
 
@@ -342,7 +341,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IDepartment o1, IDepartment o2) {
+    public static int compare(FCDepartment o1, FCDepartment o2) {
         return EqualityHelper.compare(o1.getDeptid(), o2.getDeptid());
     }
     
@@ -353,8 +352,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IDepartment) {
-            return compareTo((IDepartment)obj) == 0;
+        if (obj instanceof FCDepartment) {
+            return compareTo((FCDepartment)obj) == 0;
         }
         return false;
     }

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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -26,20 +26,18 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.jdo.tck.pc.company.IAddress;
 import org.apache.jdo.tck.pc.company.IDentalInsurance;
 import org.apache.jdo.tck.pc.company.IDepartment;
+
 import org.apache.jdo.tck.pc.company.IEmployee;
 import org.apache.jdo.tck.pc.company.IMedicalInsurance;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
  * This class represents an employee.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Implements ("org.apache.jdo.tck.pc.company.IEmployee")
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
 public abstract class FCEmployee extends FCPerson implements IEmployee {
 
@@ -112,7 +110,8 @@
     public FCEmployee(long personid, String firstname, String lastname, 
                     String middlename, Date birthdate, IAddress address,
                     Date hiredate) {
-        super(personid, firstname, lastname, middlename, birthdate, address);
+        super(personid, firstname, lastname, middlename, birthdate,
+                (FCAddress)address);
         this.hiredate = hiredate;
     }
 
@@ -257,7 +256,7 @@
      * @return The department associated with the employee.
      */
     public IDepartment getDepartment() {
-        return (IDepartment)department;
+        return department;
     }
 
     /**
@@ -273,7 +272,7 @@
      * @return The funding department associated with the employee.
      */
     public IDepartment getFundingDept() {
-        return (IDepartment)fundingDept;
+        return fundingDept;
     }
 
     /**
@@ -475,7 +474,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IEmployee otherEmp = (IEmployee)other;
+        FCEmployee otherEmp = (FCEmployee)other;
         String where = "Employee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.equals(hiredate, otherEmp.getHiredate(),  where + ".hiredate") &

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCFullTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCFullTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCFullTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -20,20 +20,18 @@
 import javax.jdo.annotations.*;
 
 import java.util.Date;
-
 import org.apache.jdo.tck.pc.company.IAddress;
-import org.apache.jdo.tck.pc.company.IEmployee;
+
 import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
  * This class represents a full-time employee.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Implements ("org.apache.jdo.tck.pc.company.IFullTimeEmployee")
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public class FCFullTimeEmployee extends FCEmployee implements IFullTimeEmployee {
+public class FCFullTimeEmployee extends FCEmployee
+        implements IFullTimeEmployee {
 
     @Column(name="SALARY")
     private double salary;
@@ -74,7 +72,7 @@
     public FCFullTimeEmployee(long personid, String first, String last,
                             String middle, Date born, IAddress addr, 
                             Date hired, double sal) {
-        super(personid, first, last, middle, born, addr, hired);
+        super(personid, first, last, middle, born, (FCAddress)addr, hired);
         salary = sal;
     }
 
@@ -127,7 +125,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IFullTimeEmployee otherEmp = (IFullTimeEmployee)other;
+        FCFullTimeEmployee otherEmp = (FCFullTimeEmployee)other;
         String where = "FCFullTimeEmployee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.closeEnough(salary, otherEmp.getSalary(), where + ".salary");

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java Tue Jul 17 08:36:42 2007
@@ -22,8 +22,8 @@
 import java.io.Serializable;
 
 import java.util.Comparator;
-
 import org.apache.jdo.tck.pc.company.IEmployee;
+
 import org.apache.jdo.tck.pc.company.IInsurance;
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
@@ -33,7 +33,6 @@
  * <code>FCEmployee</code>.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION,table="insuranceplans" )
-@Implements ("org.apache.jdo.tck.pc.company.IInsurance")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
@@ -114,7 +113,7 @@
      * @return The employee for this insurance.
      */
     public IEmployee getEmployee() {
-        return (IEmployee)employee;
+        return employee;
     }
 
     /**
@@ -157,7 +156,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IInsurance otherIns = (IInsurance)other;
+        FCInsurance otherIns = (FCInsurance)other;
         String where = "FCInsurance<" + insid + ">";
         return
             helper.equals(insid, otherIns.getInsid(), where + ".insid") &
@@ -176,14 +175,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IInsurance)o);
+        return compareTo((FCInsurance)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IInsurance)o1, (IInsurance)o2);
+        return compare((FCInsurance)o1, (FCInsurance)o2);
     }
 
     /** 
@@ -196,7 +195,7 @@
      * object is less than, equal to, or greater than the specified
      * Insurance object. 
      */
-    public int compareTo(IInsurance other) {
+    public int compareTo(FCInsurance other) {
         return compare(this, other);
     }
 
@@ -209,7 +208,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IInsurance o1, IInsurance o2) {
+    public static int compare(FCInsurance o1, FCInsurance o2) {
         return EqualityHelper.compare(o1.getInsid(), o2.getInsid());
     }
     
@@ -220,8 +219,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IInsurance) {
-            return compareTo((IInsurance)obj) == 0;
+        if (obj instanceof FCInsurance) {
+            return compareTo((FCInsurance)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCMedicalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCMedicalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCMedicalInsurance.java Tue Jul 17 08:36:42 2007
@@ -18,12 +18,9 @@
 package org.apache.jdo.tck.pc.companyAnnotatedApp;
 
 import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-
 import org.apache.jdo.tck.pc.company.IEmployee;
+
 import org.apache.jdo.tck.pc.company.IMedicalInsurance;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
@@ -31,7 +28,6 @@
  * particular <code>Employee</code>.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Implements ("org.apache.jdo.tck.pc.company.IInsurance")
 public class FCMedicalInsurance extends FCInsurance implements IMedicalInsurance {
 
     @Column(name="PLANTYPE")
@@ -65,7 +61,7 @@
     public FCMedicalInsurance(long insid, String carrier, 
                             IEmployee employee, String planType)
     {
-        super(insid, carrier, employee);
+        super(insid, carrier, (FCEmployee)employee);
         this.planType = planType;
     }
 
@@ -119,7 +115,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IMedicalInsurance otherIns = (IMedicalInsurance)other;
+        FCMedicalInsurance otherIns = (FCMedicalInsurance)other;
         String where = "FCMedicalInsurance<" + getInsid() + ">";
         return super.deepCompareFields(otherIns, helper) &
             helper.equals(planType, otherIns.getPlanType(), where + ".planType");

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPartTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPartTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPartTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -21,7 +21,6 @@
 
 import java.util.Date;
 
-import org.apache.jdo.tck.pc.company.IAddress;
 import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
@@ -30,9 +29,9 @@
  * This class represents a part-time employee.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Implements ("org.apache.jdo.tck.pc.company.IPartTimeEmployee")
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public class FCPartTimeEmployee extends FCEmployee implements IPartTimeEmployee {
+public class FCPartTimeEmployee extends FCEmployee 
+        implements IPartTimeEmployee {
 
     @Column(name="WAGE")
     private double wage;
@@ -71,7 +70,7 @@
      * @param wage The person's wage.
      */
     public FCPartTimeEmployee(long personid, String first, String last,
-                            String middle, Date born, IAddress addr, 
+                            String middle, Date born, FCAddress addr, 
                             Date hired, double wage ) {
         super(personid, first, last, middle, born, addr, hired);
         this.wage = wage;
@@ -126,7 +125,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                         EqualityHelper helper) {
-        IPartTimeEmployee otherEmp = (IPartTimeEmployee)other;
+        FCPartTimeEmployee otherEmp = (FCPartTimeEmployee)other;
         String where = "FCPartTimeEmployee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.closeEnough(wage, otherEmp.getWage(), where + ".wage");

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java Tue Jul 17 08:36:42 2007
@@ -29,8 +29,8 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.jdo.tck.pc.company.IAddress;
+
 import org.apache.jdo.tck.pc.company.IPerson;
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
@@ -39,7 +39,6 @@
  * This class represents a person.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION,table="persons")
-@Implements ("org.apache.jdo.tck.pc.company.IPerson")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
@@ -307,7 +306,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IPerson otherPerson = (IPerson)other;
+        FCPerson otherPerson = (FCPerson)other;
         String where = "FCPerson<" + personid + ">";
         return 
             helper.equals(personid, otherPerson.getPersonid(), where + ".personid") &
@@ -330,14 +329,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IPerson)o);
+        return compareTo((FCPerson)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IPerson)o1, (IPerson)o2);
+        return compare((FCPerson)o1, (FCPerson)o2);
     }
 
     /** 
@@ -350,7 +349,7 @@
      * object is less than, equal to, or greater than the specified FCPerson 
      * object. 
      */
-    public int compareTo(IPerson other) {
+    public int compareTo(FCPerson other) {
         return compare(this, other);
     }
 
@@ -363,7 +362,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IPerson o1, IPerson o2) {
+    public static int compare(FCPerson o1, FCPerson o2) {
         return EqualityHelper.compare(o1.getPersonid(), o2.getPersonid());
     }
     
@@ -374,8 +373,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IPerson) {
-            return compareTo((IPerson)obj) == 0;
+        if (obj instanceof FCPerson) {
+            return compareTo((FCPerson)obj) == 0;
         }
         return false;
     }

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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -38,7 +38,6 @@
  * employees working on it.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION, table="projects")
-@Implements ("org.apache.jdo.tck.pc.company.IProject")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -245,7 +244,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IProject otherProject = (IProject)other;
+        FCProject otherProject = (FCProject)other;
         String where = "FCProject<" + projid + ">";
         return 
             helper.equals(projid, otherProject.getProjid(), where + ".projid") &
@@ -266,14 +265,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IProject)o);
+        return compareTo((FCProject)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IProject)o1, (IProject)o2);
+        return compare((FCProject)o1, (FCProject)o2);
     }
 
     /** 
@@ -286,7 +285,7 @@
      * object is less than, equal to, or greater than the specified FCProject
      * object. 
      */
-    public int compareTo(IProject other) {
+    public int compareTo(FCProject other) {
         return compare(this, other);
     }
 
@@ -299,7 +298,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IProject o1, IProject o2) {
+    public static int compare(FCProject o1, FCProject o2) {
         return EqualityHelper.compare(o1.getProjid(), o2.getProjid());
     }
 
@@ -310,8 +309,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IProject) {
-            return compareTo((IProject)obj) == 0;
+        if (obj instanceof FCProject) {
+            return compareTo((FCProject)obj) == 0;
         }
         return false;
     }

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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -19,10 +19,10 @@
 
 import javax.jdo.annotations.*;
 
+import org.apache.jdo.tck.pc.company.ICompany;
 import java.util.Date;
 import java.util.Set;
-
-import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IAddress;
 
 /**
  * This interface represents the persistent state of Company.
@@ -45,7 +45,7 @@
             @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
             @Field(name="country", columns=@Column(name="COUNTRY"))
     })
-    PIAddress getAddress();
+    IAddress getAddress();
     @Property(primaryKey="true")
     @Column(name="ID")
     long getCompanyid();
@@ -57,7 +57,7 @@
     @Column(name="NAME", jdbcType="VARCHAR")
     String getName();
     
-    void setAddress(PIAddress a);
+    void setAddress(IAddress a);
     void setCompanyid(long id);
     void setDepartments(Set depts);
     void setFounded(Date date);

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=556949&r1=556948&r2=556949
==============================================================================
--- 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 Tue Jul 17 08:36:42 2007
@@ -29,7 +29,8 @@
  * the purpose of the interface.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-public interface PIDentalInsurance extends PIInsurance, IDentalInsurance {
+public interface PIDentalInsurance extends IDentalInsurance,
+        PIInsurance {
 
     @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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -20,8 +20,10 @@
 import javax.jdo.annotations.*;
 
 import java.util.Set;
+import org.apache.jdo.tck.pc.company.ICompany;
 
 import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IEmployee;
 
 /**
  * This interface represents the persistent state of Department.
@@ -29,7 +31,6 @@
  * the purpose of the interface.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION, table="departments")
-@Implements ("org.apache.jdo.tck.pc.company.IDepartment")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -41,9 +42,9 @@
     @Column(name="NAME")
     String getName();
     @Column(name="COMPANYID")
-    PICompany getCompany();
+    ICompany getCompany();
     @Column(name="EMP_OF_THE_MONTH")
-    PIEmployee getEmployeeOfTheMonth();
+    IEmployee getEmployeeOfTheMonth();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
             mappedBy="department")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
@@ -55,8 +56,8 @@
     
     void setDeptid(long deptid);
     void setName(String name);
-    void setCompany(PICompany company);
-    void setEmployeeOfTheMonth(PIEmployee employeeOfTheMonth);
+    void setCompany(ICompany company);
+    void setEmployeeOfTheMonth(IEmployee employeeOfTheMonth);
     void setEmployees(Set employees);
     void setFundedEmps(Set employees);
 

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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -19,10 +19,13 @@
 
 import javax.jdo.annotations.*;
 
+import org.apache.jdo.tck.pc.company.IPerson;
 import java.util.Date;
 import java.util.Set;
-
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
 import org.apache.jdo.tck.pc.company.IEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
 
 /**
  * This interface represents the persistent state of Employee.
@@ -31,7 +34,7 @@
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-public interface PIEmployee extends PIPerson, IEmployee {
+public interface PIEmployee extends PIPerson, IPerson {
 
     @Column(name="HIREDATE")
     Date getHiredate();
@@ -46,25 +49,25 @@
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIProject.class)
     Set getProjects();
     @Property(mappedBy="employee")
-    PIDentalInsurance getDentalInsurance();
+    IDentalInsurance getDentalInsurance();
     @Property(mappedBy="employee")
-    PIMedicalInsurance getMedicalInsurance();
+    IMedicalInsurance getMedicalInsurance();
     @Column(name="DEPARTMENT")
-    PIDepartment getDepartment();
+    IDepartment getDepartment();
     @Column(name="FUNDINGDEPT")
-    PIDepartment getFundingDept();
+    IDepartment getFundingDept();
     @Column(name="MANAGER")
-    PIEmployee getManager();
+    IEmployee getManager();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
             mappedBy="manager")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
     Set getTeam();
     @Column(name="MENTOR")
-    PIEmployee getMentor();
+    IEmployee getMentor();
     @Property(mappedBy="mentor")
-    PIEmployee getProtege();
+    IEmployee getProtege();
     @Column(name="HRADVISOR")
-    PIEmployee getHradvisor();
+    IEmployee getHradvisor();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.PIEmployee.class)
     Set getHradvisees();
@@ -73,15 +76,15 @@
     void setWeeklyhours(double weeklyhours);
     void setReviewedProjects(Set reviewedProjects);
     void setProjects(Set projects);
-    void setDentalInsurance(PIDentalInsurance dentalInsurance);
-    void setMedicalInsurance(PIMedicalInsurance medicalInsurance);
-    void setDepartment(PIDepartment department);
-    void setFundingDept(PIDepartment department);
-    void setManager(PIEmployee manager);
+    void setDentalInsurance(IDentalInsurance dentalInsurance);
+    void setMedicalInsurance(IMedicalInsurance medicalInsurance);
+    void setDepartment(IDepartment department);
+    void setFundingDept(IDepartment department);
+    void setManager(IEmployee manager);
     void setTeam(Set team);
-    void setMentor(PIEmployee mentor);
-    void setProtege(PIEmployee protege);
-    void setHradvisor(PIEmployee hradvisor);
+    void setMentor(IEmployee mentor);
+    void setProtege(IEmployee protege);
+    void setHradvisor(IEmployee hradvisor);
     void setHradvisees(Set hradvisees);
     
 }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIFullTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIFullTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIFullTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -17,6 +17,7 @@
  
 package org.apache.jdo.tck.pc.companyAnnotatedApp;
 
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
 import javax.jdo.annotations.*;
 
 /**
@@ -26,7 +27,7 @@
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
 @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/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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -18,6 +18,7 @@
 package org.apache.jdo.tck.pc.companyAnnotatedApp;
 
 import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IEmployee;
 
 import org.apache.jdo.tck.pc.company.IInsurance;
 
@@ -40,9 +41,9 @@
     @Column(name="CARRIER")
     String getCarrier();
     @Column(name="EMPLOYEE")
-    PIEmployee getEmployee();
+    IEmployee getEmployee();
 
     void setInsid(long insid);
     void setCarrier(String carrier);
-    void setEmployee(PIEmployee employee);
+    void setEmployee(IEmployee employee);
 }

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=556949&r1=556948&r2=556949
==============================================================================
--- 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 Tue Jul 17 08:36:42 2007
@@ -27,7 +27,8 @@
  * the purpose of the interface.
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
-public interface PIMedicalInsurance extends PIInsurance, IMedicalInsurance {
+public interface PIMedicalInsurance 
+        extends PIInsurance, IMedicalInsurance{
 
     @Column(name="PLANTYPE")
     String getPlanType();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPartTimeEmployee.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPartTimeEmployee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPartTimeEmployee.java Tue Jul 17 08:36:42 2007
@@ -17,6 +17,7 @@
 
 package org.apache.jdo.tck.pc.companyAnnotatedApp;
 
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
 import javax.jdo.annotations.*;
 
 /**
@@ -26,7 +27,7 @@
  */
 @PersistenceCapable(identityType=IdentityType.APPLICATION)
 @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/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=556949&r1=556948&r2=556949
==============================================================================
--- 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 17 08:36:42 2007
@@ -21,6 +21,7 @@
 
 import java.util.Date;
 import java.util.Map;
+import org.apache.jdo.tck.pc.company.IAddress;
 
 import org.apache.jdo.tck.pc.company.IPerson;
 
@@ -55,7 +56,7 @@
             @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
             @Field(name="country", columns=@Column(name="COUNTRY"))
     })
-    PIAddress getAddress();
+    IAddress getAddress();
     Date getBirthdate();
     @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
             table="employee_phoneno_type")
@@ -68,7 +69,7 @@
     void setLastname(String lastname);
     void setFirstname(String firstname);
     void setMiddlename(String middlename);
-    void setAddress(PIAddress address);
+    void setAddress(IAddress address);
     void setBirthdate(Date birthdate);
     void setPhoneNumbers(Map phoneNumbers);
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCAddress.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCAddress.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCAddress.java Tue Jul 17 08:36:42 2007
@@ -21,8 +21,8 @@
 import java.util.Comparator;
 
 import javax.jdo.annotations.*;
-
 import org.apache.jdo.tck.pc.company.IAddress;
+
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -30,7 +30,6 @@
  * This class represents a postal address.
  */
 @PersistenceCapable(embeddedOnly="true", requiresExtent="false")
-@Implements ("org.apache.jdo.tck.pc.company.IAddress")
 public class FCAddress 
     implements IAddress, Serializable, Comparable, Comparator, DeepEquality {
 
@@ -200,7 +199,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IAddress otherAddress = (IAddress)other;
+        FCAddress otherAddress = (FCAddress)other;
         String where = "Address<" + addrid + ">";
         return
             helper.equals(addrid, otherAddress.getAddrid(), where + ".addrid") &
@@ -222,14 +221,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((IAddress)o);
+        return compareTo((FCAddress)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((IAddress)o1, (IAddress)o2);
+        return compare((FCAddress)o1, (FCAddress)o2);
     }
 
     /** 
@@ -242,20 +241,20 @@
      * object is less than, equal to, or greater than the specified Address
      * object. 
      */
-    public int compareTo(IAddress other) {
+    public int compareTo(FCAddress other) {
         return compare(this, other);
     }
     
     /**
-     * Compares its two IAddress arguments for order. Returns a negative
+     * Compares its two FCAddress arguments for order. Returns a negative
      * integer, zero, or a positive integer as the first argument is less
      * than, equal to, or greater than the second. 
-     * @param o1 the first IAddress object to be compared. 
-     * @param o2 the second IAddress object to be compared. 
+     * @param o1 the first FCAddress object to be compared. 
+     * @param o2 the second FCAddress object to be compared. 
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(IAddress o1, IAddress o2) {
+    public static int compare(FCAddress o1, FCAddress o2) {
         return EqualityHelper.compare(o1.getAddrid(), o2.getAddrid());
     }
 
@@ -266,8 +265,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof IAddress) {
-            return compareTo((IAddress)obj) == 0;
+        if (obj instanceof FCAddress) {
+            return compareTo((FCAddress)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCCompany.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCCompany.java Tue Jul 17 08:36:42 2007
@@ -30,10 +30,9 @@
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Date;
-
-//import org.apache.jdo.tck.pc.company.*;
-import org.apache.jdo.tck.pc.company.ICompany;
 import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+
 import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
@@ -41,7 +40,6 @@
  * This class represents information about a company.
  */
 @PersistenceCapable(table="companies")
-@Implements ("org.apache.jdo.tck.pc.company.ICompany")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -248,7 +246,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        ICompany otherCompany = (ICompany)other;
+        FCCompany otherCompany = (FCCompany)other;
         String where = "Company<" + companyid + ">";
         return 
             helper.equals(companyid, otherCompany.getCompanyid(), where + ".companyid") &
@@ -269,14 +267,14 @@
      * it from being compared to this Object. 
      */
     public int compareTo(Object o) {
-        return compareTo((ICompany)o);
+        return compareTo((FCCompany)o);
     }
 
     /** 
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return compare((ICompany)o1, (ICompany)o2);
+        return compare((FCCompany)o1, (FCCompany)o2);
     }
 
     /** 
@@ -289,7 +287,7 @@
      * object is less than, equal to, or greater than the specified Company
      * object. 
      */
-    public int compareTo(ICompany other) {
+    public int compareTo(FCCompany other) {
         return compare(this, other);
     }
 
@@ -302,7 +300,7 @@
      * @return a negative integer, zero, or a positive integer as the first
      * object is less than, equal to, or greater than the second object. 
      */
-    public static int compare(ICompany o1, ICompany o2) {
+    public static int compare(FCCompany o1, FCCompany o2) {
         return EqualityHelper.compare(o1.getCompanyid(), o2.getCompanyid());
     }
     
@@ -313,8 +311,8 @@
      * argument; <code>false</code> otherwise. 
      */
     public boolean equals(Object obj) {
-        if (obj instanceof ICompany) {
-            return compareTo((ICompany)obj) == 0;
+        if (obj instanceof FCCompany) {
+            return compareTo((FCCompany)obj) == 0;
         }
         return false;
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDentalInsurance.java?view=diff&rev=556949&r1=556948&r2=556949
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDentalInsurance.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDentalInsurance.java Tue Jul 17 08:36:42 2007
@@ -20,10 +20,7 @@
 import javax.jdo.annotations.*;
 
 import java.math.BigDecimal;
-
 import org.apache.jdo.tck.pc.company.IDentalInsurance;
-import org.apache.jdo.tck.pc.company.IEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 /**
@@ -31,9 +28,9 @@
  * particular <code>Employee</code>.
  */
 @PersistenceCapable
-@Implements ("org.apache.jdo.tck.pc.company.IDentalInsurance")
 @DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
-public class FCDentalInsurance extends FCInsurance implements IDentalInsurance {
+public class FCDentalInsurance extends FCInsurance
+        implements IDentalInsurance {
 
     @Column(name="LIFETIME_ORTHO_BENEFIT")
     private BigDecimal lifetimeOrthoBenefit;
@@ -62,7 +59,7 @@
      * @param employee The employee associated with this insurance.
      * @param lifetimeOrthoBenefit The lifetimeOrthoBenefit.
      */
-    public FCDentalInsurance(long insid, String carrier, IEmployee employee,
+    public FCDentalInsurance(long insid, String carrier, FCEmployee employee,
                            BigDecimal lifetimeOrthoBenefit) {
         super(insid, carrier, employee);
         this.lifetimeOrthoBenefit = lifetimeOrthoBenefit;
@@ -118,7 +115,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        IDentalInsurance otherIns = (IDentalInsurance)other;
+        FCDentalInsurance otherIns = (FCDentalInsurance)other;
         String where = "FCDentalInsurance<" + getInsid() + ">";
         return super.deepCompareFields(otherIns, helper) &
             helper.equals(lifetimeOrthoBenefit, 



Mime
View raw message