db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r557767 [4/4] - in /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc: company/ companyAnnotatedApp/ companyAnnotatedDS/ companyAnnotatedFC/ companyAnnotatedPI/
Date Thu, 19 Jul 2007 20:52:33 GMT
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,389 @@
+/*
+ * 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.companyAnnotatedFC;
+
+import javax.jdo.annotations.*;
+
+import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.HashSet;
+import java.math.BigDecimal;
+import org.apache.jdo.tck.pc.company.IProject;
+
+import org.apache.jdo.tck.util.DeepEquality;
+import org.apache.jdo.tck.util.EqualityHelper;
+
+/**
+ * This class represents a project, a budgeted task with one or more
+ * employees working on it.
+ */
+@PersistenceCapable(table="projects")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+public class FCDSProject 
+    implements IProject, Serializable, Comparable, Comparator, DeepEquality  {
+
+    @Column(name="PROJID")
+    private long projid;
+    @Column(name="NAME")
+    private String     name;
+    @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
+    private BigDecimal budget;
+    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            table="project_reviewer")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
+            column="REVIEWER")
+    @Join(column="PROJID")
+    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+    private transient Set reviewers = new HashSet();
+    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            table="project_member")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCDSEmployee.class,
+            column="MEMBER")
+    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCDSEmployee.class,
+    //    foreignKey=@ForeignKey(name="PR_REV_FK"))
+    @Join(column="PROJID")
+    private transient Set members = new HashSet();
+
+    /** This is the JDO-required no-args constructor. The TCK relies on
+     * this constructor for testing PersistenceManager.newInstance(PCClass).
+     */
+    public FCDSProject() {}
+
+    /**
+     * Initialize a project.
+     * @param projid The project identifier.
+     * @param name The name of the project.
+     * @param budget The budget for the project.
+     */
+    public FCDSProject(long projid, String name, BigDecimal budget) {
+        this.projid = projid;
+        this.name = name;
+        this.budget = budget;
+    }
+
+    /**
+     * Set the id associated with this object.
+     * @param id the id.
+     */
+    public void setProjid(long id) {
+        if (this.projid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.projid = id;
+    }
+
+    /**
+     * Get the project ID.
+     * @return The project ID.
+     */
+    public long getProjid() {
+        return projid;
+    }
+
+    /**
+     * Get the name of the project.
+     * @return The name of the project.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set the name of the project.
+     * @param name The name of the project.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Get the project's budget.
+     * @return The project's budget.
+     */
+    public BigDecimal getBudget() {
+        return budget;
+    }
+
+    /**
+     * Set the project's budget.
+     * @param budget The project's budget.
+     */
+    public void setBudget(BigDecimal budget) {
+        this.budget = budget;
+    }
+
+    /**
+     * Get the reviewers associated with this project.
+     */
+    public Set getReviewers() {
+        return Collections.unmodifiableSet(reviewers);
+    }
+
+    /**
+     * Add a reviewer to the project.
+     * @param emp The employee to add as a reviewer.
+     */
+    public void addReviewer(FCDSEmployee emp) {
+        reviewers.add(emp);
+    }
+
+    /**
+     * Remove a reviewer from the project.
+     * @param emp The employee to remove as a reviewer of this project.
+     */
+    public void removeReviewer(FCDSEmployee emp) {
+        reviewers.remove(emp);
+    }
+
+    /**
+     * Set the reviewers associated with this project.
+     * @param reviewers The set of reviewers to associate with this project.
+     */
+    public void setReviewers(Set reviewers) {
+        // workaround: create a new HashSet, because fostore does not
+        // support LinkedHashSet
+        this.reviewers = (reviewers != null) ? new HashSet(reviewers) : null;
+    }
+
+    /**
+     * Get the project members.
+     * 
+     * @return The members of the project is returned as an unmodifiable
+     * set of <code>FCDSEmployee</code>s.
+     */
+    public Set getMembers() {
+        return Collections.unmodifiableSet(members);
+    }
+
+    /**
+     * Add a new member to the project.
+     * @param emp The employee to add to the project.
+     */
+    public void addMember(FCDSEmployee emp) {
+        members.add(emp);
+    }
+
+    /**
+     * Remove a member from the project.
+     * @param emp The employee to remove from the project.
+     */
+    public void removeMember(FCDSEmployee emp) {
+        members.remove(emp);
+    }
+
+    /**
+     * Set the members of the project.
+     * @param employees The set of employees to be the members of this
+     * project. 
+     */
+    public void setMembers(Set employees) {
+        // workaround: create a new HashSet, because fostore does not
+        // support LinkedHashSet
+        this.members = (members != null) ? new HashSet(employees) : null;
+    }
+
+    /** Serialization support: initialize transient fields. */
+    private void readObject(ObjectInputStream in)
+        throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        reviewers = new HashSet();
+        members = new HashSet();
+    }
+
+    /**
+     * Returns a String representation of a <code>FCDSProject</code> object.
+     * 
+     * @return a String representation of a <code>FCDSProject</code> object.
+     */
+    public String toString() {
+        return "FCProject(" + getFieldRepr() + ")";
+    }
+    
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(projid);
+        rc.append(", name ").append(name);
+        rc.append(", budget ").append(budget);
+        return rc.toString();
+    }
+
+    /** 
+     * Returns <code>true</code> if all the fields of this instance are
+     * deep equal to the coresponding fields of the specified Person.
+     * @param other the object with which to compare.
+     * @param helper EqualityHelper to keep track of instances that have
+     * already been processed. 
+     * @return <code>true</code> if all the fields are deep equal;
+     * <code>false</code> otherwise.  
+     * @throws ClassCastException if the specified instances' type prevents
+     * it from being compared to this instance. 
+     */
+    public boolean deepCompareFields(Object other, 
+                                     EqualityHelper helper) {
+        FCDSProject otherProject = (FCDSProject)other;
+        String where = "FCProject<" + projid + ">";
+        return 
+            helper.equals(projid, otherProject.getProjid(), where + ".projid") &
+            helper.equals(name, otherProject.getName(), where + ".name") &
+            helper.equals(budget, otherProject.getBudget(), where + ".budget") &
+            helper.deepEquals(reviewers, otherProject.getReviewers(), where + ".reviewers") &
+            helper.deepEquals(members, otherProject.getMembers(), where + ".members");
+    }
+    
+    /** 
+     * Compares this object with the specified object for order. Returns a
+     * negative integer, zero, or a positive integer as this object is less
+     * than, equal to, or greater than the specified object. 
+     * @param o The Object to be compared. 
+     * @return a negative integer, zero, or a positive integer as this 
+     * object is less than, equal to, or greater than the specified object. 
+     * @throws ClassCastException - if the specified object's type prevents
+     * it from being compared to this Object. 
+     */
+    public int compareTo(Object o) {
+        return compareTo((FCDSProject)o);
+    }
+
+    /** 
+     * Compare two instances. This is a method in Comparator.
+     */
+    public int compare(Object o1, Object o2) {
+        return compare((FCDSProject)o1, (FCDSProject)o2);
+    }
+
+    /**
+     * 
+     * Compares this object with the specified FCDSProject object for
+     * order. Returns a negative integer, zero, or a positive integer as
+     * this object is less than, equal to, or greater than the specified
+     * object.  
+     * 
+     * @param other The FCDSProject object to be compared.
+     * @return a negative integer, zero, or a positive integer as this
+     * object is less than, equal to, or greater than the specified FFCDSProject object.
+     */
+    public int compareTo(FCDSProject other) {
+        return compare(this, other);
+    }
+
+    /**
+     * Compares its two IProject 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 IProject object to be compared. 
+     * @param o2 the second IProject 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(FCDSProject o1, FCDSProject o2) {
+        return EqualityHelper.compare(o1.getProjid(), o2.getProjid());
+    }
+
+    /** 
+     * Indicates whether some other object is "equal to" this one.
+     * @param obj the object with which to compare.
+     * @return <code>true</code> if this object is the same as the obj
+     * argument; <code>false</code> otherwise. 
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof FCDSProject) {
+            return compareTo((FCDSProject)obj) == 0;
+        }
+        return false;
+    }
+        
+    /**
+     * Returns a hash code value for the object. 
+     * @return a hash code value for this object.
+     */
+    public int hashCode() {
+        return (int)projid;
+    }
+
+    /**
+     * This class is used to represent the application identity
+     * for the <code>FCDSProject</code> class.
+     */
+    public static class Oid implements Serializable, Comparable {
+
+        /**
+         * This field represents the identifier for the
+         * <code>FCDSProject</code> class. It must match a field in the
+         * <code>FCDSProject</code> class in both name and type.
+         */
+        public long projid;
+
+        /**
+         * The required public no-arg constructor.
+         */
+        public Oid() { }
+
+        /**
+         * Initialize the application identifier with a project ID.
+         * @param projid The id of the project.
+         */
+        public Oid(long projid) {
+            this.projid = projid;
+        }
+        
+        public Oid(String s) { projid = Long.parseLong(justTheId(s)); }
+
+        public String toString() { return this.getClass().getName() + ": "  + projid;}
+
+        /** */
+        public boolean equals(java.lang.Object obj) {
+            if( obj==null || !this.getClass().equals(obj.getClass()) )
+                return( false );
+            Oid o = (Oid) obj;
+            if( this.projid != o.projid ) return( false );
+            return( true );
+        }
+
+        /** */
+        public int hashCode() {
+            return( (int) projid );
+        }
+        
+        protected static String justTheId(String str) {
+            return str.substring(str.indexOf(':') + 1);
+        }
+
+        /** */
+        public int compareTo(Object obj) {
+            // may throw ClassCastException which the user must handle
+            Oid other = (Oid) obj;
+            if( projid < other.projid ) return -1;
+            if( projid > other.projid ) return 1;
+            return 0;
+        }
+
+    }
+
+}
+

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,128 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.*;
+
+/*
+ * CompanyFactoryAnnotatedPMInterface.java
+ *
+ */
+public class CompanyFactoryAnnotatedPMInterface 
+        extends CompanyFactoryAbstractImpl {
+    
+    Class addressClass = null;
+    Class dentalInsuranceClass = null;
+    Class medicalInsuranceClass = null;
+    Class partTimeEmployeeClass = null;
+    Class fullTimeEmployeeClass = null;
+    Class projectClass = null;
+    Class departmentClass = null;
+    Class companyClass = null;
+    
+    /** */
+    public  final Class[] tearDownClasses = new Class[] {
+        dentalInsuranceClass,
+        medicalInsuranceClass,
+        partTimeEmployeeClass,
+        fullTimeEmployeeClass,
+        projectClass,
+        departmentClass,
+        companyClass
+    };
+
+    /**
+     * Creates a new instance of CompanyFactoryAnnotatedPMInterface 
+     */
+    public CompanyFactoryAnnotatedPMInterface(PersistenceManager pm) {
+        super(pm);
+
+        if (isAppIdentity){
+            addressClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class;
+            dentalInsuranceClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDentalInsurance.class;
+            medicalInsuranceClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppMedicalInsurance.class;
+            partTimeEmployeeClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppPartTimeEmployee.class;
+            fullTimeEmployeeClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppFullTimeEmployee.class;
+            projectClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class;
+            departmentClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class;
+            companyClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppCompany.class;
+        } else { //datastoreidentity
+            addressClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSAddress.class;
+            dentalInsuranceClass = 
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDentalInsurance.class;
+            medicalInsuranceClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSMedicalInsurance.class;
+            partTimeEmployeeClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSPartTimeEmployee.class;
+            fullTimeEmployeeClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSFullTimeEmployee.class;
+            projectClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class;
+            departmentClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class;
+            companyClass =
+                    org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSCompany.class;
+        }
+    }
+    
+    public IAddress newAddress() {
+        return (IAddress)pm.newInstance(addressClass);
+    }
+    
+    public ICompany newCompany() {
+        return (ICompany)pm.newInstance(companyClass);
+    }
+    
+    public IDentalInsurance newDentalInsurance() {
+        return (IDentalInsurance)pm.newInstance(dentalInsuranceClass);
+    }
+    
+    public IDepartment newDepartment() {
+        return (IDepartment)pm.newInstance(departmentClass);
+    }
+    
+    public IFullTimeEmployee newFullTimeEmployee() {
+        return (IFullTimeEmployee)pm.newInstance(fullTimeEmployeeClass);
+    }
+    
+    public IMedicalInsurance newMedicalInsurance() {
+        return (IMedicalInsurance)pm.newInstance(medicalInsuranceClass);        
+    }
+    
+    public IPartTimeEmployee newPartTimeEmployee() {
+        return (IPartTimeEmployee)pm.newInstance(partTimeEmployeeClass);
+    }
+    
+    public IProject newProject() {
+        return (IProject)pm.newInstance(projectClass);
+    }
+
+    public Class[] getTearDownClasses() {
+        return tearDownClasses;
+    }
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java Thu Jul 19 13:52:29 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.companyAnnotatedPI;
+
+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 PIAppAddress extends IAddress {
+
+    @Property(primaryKey="true")
+    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);
+}

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,66 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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.IAddress;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of Company.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION, table="companies")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+public interface PIAppCompany extends ICompany {
+    
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Embedded(nullIndicatorColumn="COUNTRY",
+        fields={
+            @Field(name="addrid", columns=@Column(name="ADDRID")),
+            @Field(name="street", columns=@Column(name="STREET")),
+            @Field(name="city", columns=@Column(name="CITY")),
+            @Field(name="state", columns=@Column(name="STATE")),
+            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Field(name="country", columns=@Column(name="COUNTRY"))
+    })
+    IAddress getAddress();
+    @Property(primaryKey="true")
+    @Column(name="ID")
+    long getCompanyid();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppDepartment.class)
+    Set getDepartments();
+    @Column(name="FOUNDEDDATE")
+    Date getFounded();
+    @Column(name="NAME", jdbcType="VARCHAR")
+    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/companyAnnotatedPI/PIAppCompany.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,39 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+import java.math.BigDecimal;
+
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of DentalInsurance.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+public interface PIAppDentalInsurance extends IDentalInsurance,
+        PIAppInsurance {
+
+    @Column(name="LIFETIME_ORTHO_BENEFIT")
+    BigDecimal getLifetimeOrthoBenefit();
+    void setLifetimeOrthoBenefit(BigDecimal lifetimeOrthoBenefit);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,65 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of Department.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION, table="departments")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+public interface PIAppDepartment extends IDepartment {
+
+    @Property(primaryKey="true")
+    @Column(name="ID")
+    long getDeptid();
+    @Column(name="NAME")
+    String getName();
+    @Column(name="COMPANYID")
+    ICompany getCompany();
+    @Column(name="EMP_OF_THE_MONTH")
+    IEmployee getEmployeeOfTheMonth();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
+            mappedBy="department")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    Set getEmployees();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="fundingDept")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    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/companyAnnotatedPI/PIAppDepartment.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,91 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of Employee.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+public interface PIAppEmployee extends PIAppPerson, IPerson {
+
+    @Column(name="HIREDATE")
+    Date getHiredate();
+    @Column(name="WEEKLYHOURS")
+    double getWeeklyhours();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="reviewers")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
+    Set getReviewedProjects();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="members")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppProject.class)
+    Set getProjects();
+    @Property(mappedBy="employee")
+    IDentalInsurance getDentalInsurance();
+    @Property(mappedBy="employee")
+    IMedicalInsurance getMedicalInsurance();
+    @Column(name="DEPARTMENT")
+    IDepartment getDepartment();
+    @Column(name="FUNDINGDEPT")
+    IDepartment getFundingDept();
+    @Column(name="MANAGER")
+    IEmployee getManager();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="manager")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    Set getTeam();
+    @Column(name="MENTOR")
+    IEmployee getMentor();
+    @Property(mappedBy="mentor")
+    IEmployee getProtege();
+    @Column(name="HRADVISOR")
+    IEmployee getHradvisor();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    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/companyAnnotatedPI/PIAppEmployee.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of FullTimeEmployee.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+public interface PIAppFullTimeEmployee extends PIAppEmployee, IFullTimeEmployee {
+
+    @Column(name="SALARY")
+    double getSalary();
+    void setSalary(double salary);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,50 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IEmployee;
+
+import org.apache.jdo.tck.pc.company.IInsurance;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of Insurance.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="insuranceplans")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR", indexed="true")
+@Index(name="INS_DISCRIMINATOR_INDEX", unique="false",
+        columns=@Column(name="DISCRIMINATOR"))
+    public interface PIAppInsurance extends IInsurance {
+
+    @Property(primaryKey="true")
+    @Column(name="INSID")
+    long getInsid();
+    @Column(name="CARRIER")
+    String getCarrier();
+    @Column(name="EMPLOYEE")
+    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/companyAnnotatedPI/PIAppInsurance.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of MedicalInsurance.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+public interface PIAppMedicalInsurance 
+        extends PIAppInsurance, IMedicalInsurance{
+
+    @Column(name="PLANTYPE")
+    String getPlanType();
+    void setPlanType(String planType);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of PartTimeEmployee.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+public interface PIAppPartTimeEmployee extends PIAppEmployee, IPartTimeEmployee {
+
+    @Column(name="WAGE")
+    double getWage();
+    void setWage(double wage);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,77 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+import java.util.Date;
+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.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of Person.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="persons")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR", indexed="true")
+public interface PIAppPerson extends IPerson {
+
+    @Property(primaryKey="true")
+    @Column(name="PERSONID")
+    long getPersonid();
+    @Column(name="LASTNAME")
+    String getLastname();
+    @Column(name="FIRSTNAME")
+    String getFirstname();
+    @Property(defaultFetchGroup="false")
+    @Column(name="MIDDLENAME", allowsNull="true")
+    String getMiddlename();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Embedded(nullIndicatorColumn="COUNTRY",
+        fields={
+            @Field(name="addrid", columns=@Column(name="ADDRID")),
+            @Field(name="street", columns=@Column(name="STREET")),
+            @Field(name="city", columns=@Column(name="CITY")),
+            @Field(name="state", columns=@Column(name="STATE")),
+            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Field(name="country", columns=@Column(name="COUNTRY"))
+    })
+    IAddress getAddress();
+    Date getBirthdate();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            table="employee_phoneno_type")
+    @Join(column="EMPID")
+    @Key(types=java.lang.String.class)
+    @Value(types=java.lang.String.class)
+    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/companyAnnotatedPI/PIAppPerson.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,71 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+import java.math.BigDecimal;
+import java.util.Set;
+
+import org.apache.jdo.tck.pc.company.IProject;
+import org.apache.jdo.tck.pc.companyAnnotatedFC.*;
+
+/**
+ * This interface represents the persistent state of Project.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="projects")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+public interface PIAppProject extends IProject {
+
+    @Property(primaryKey="true")
+    @Column(name="PROJID")
+    long getProjid();
+    @Column(name="NAME")
+    String getName();
+    @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
+    BigDecimal getBudget();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            table="project_reviewer")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+            column="REVIEWER")
+    @Join(column="PROJID")
+    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+    Set getReviewers();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            table="project_member")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedFC.FCAppEmployee.class,
+            column="MEMBER")
+    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCAppEmployee.class,
+    //    foreignKey=@ForeignKey(name="PR_REV_FK"))
+    @Join(column="PROJID")
+    Set getMembers();
+    
+    void setProjid(long projid);
+    void setName(String name);
+    void setBudget(BigDecimal budget);
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    void setReviewers(Set reviewers);
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppEmployee.class)
+    void setMembers(Set employees);
+    
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,44 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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 PIDSAddress 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/companyAnnotatedPI/PIDSAddress.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,67 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+import java.util.Date;
+import java.util.Set;
+import org.apache.jdo.tck.pc.company.IAddress;
+
+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
+ * the purpose of the interface.
+ */
+@PersistenceCapable(table="companies")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
+        column="DATASTORE_IDENTITY")
+public interface PIDSCompany extends ICompany {
+    
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Embedded(nullIndicatorColumn="COUNTRY",
+        fields={
+            @Field(name="addrid", columns=@Column(name="ADDRID")),
+            @Field(name="street", columns=@Column(name="STREET")),
+            @Field(name="city", columns=@Column(name="CITY")),
+            @Field(name="state", columns=@Column(name="STATE")),
+            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Field(name="country", columns=@Column(name="COUNTRY"))
+    })
+    IAddress getAddress();
+    @Column(name="ID")
+    long getCompanyid();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSDepartment.class)
+    Set getDepartments();
+    @Column(name="FOUNDEDDATE")
+    Date getFounded();
+    @Column(name="NAME", jdbcType="VARCHAR")
+    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/companyAnnotatedPI/PIDSCompany.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+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 PIDSDentalInsurance extends IDentalInsurance, PIDSInsurance {
+
+    @Column(name="LIFETIME_ORTHO_BENEFIT")
+    BigDecimal getLifetimeOrthoBenefit();
+    void setLifetimeOrthoBenefit(BigDecimal lifetimeOrthoBenefit);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,65 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable(table="departments")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
+        column="DATASTORE_IDENTITY")
+public interface PIDSDepartment extends IDepartment {
+
+    @Column(name="ID")
+    long getDeptid();
+    @Column(name="NAME")
+    String getName();
+    @Column(name="COMPANYID")
+    ICompany getCompany();
+    @Column(name="EMP_OF_THE_MONTH")
+    IEmployee getEmployeeOfTheMonth();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, 
+            mappedBy="department")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    Set getEmployees();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="fundingDept")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    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/companyAnnotatedPI/PIDSDepartment.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,89 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+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.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+@PersistenceCapable
+@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+public interface PIDSEmployee extends IEmployee, PIDSPerson {
+
+    @Column(name="HIREDATE")
+    Date getHiredate();
+    @Column(name="WEEKLYHOURS")
+    double getWeeklyhours();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="reviewers")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
+    Set getReviewedProjects();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="members")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSProject.class)
+    Set getProjects();
+    @Property(mappedBy="employee")
+    IDentalInsurance getDentalInsurance();
+    @Property(mappedBy="employee")
+    IMedicalInsurance getMedicalInsurance();
+    @Column(name="DEPARTMENT")
+    IDepartment getDepartment();
+    @Column(name="FUNDINGDEPT")
+    IDepartment getFundingDept();
+    @Column(name="MANAGER")
+    IEmployee getManager();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            mappedBy="manager")
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    Set getTeam();
+    @Column(name="MENTOR")
+    IEmployee getMentor();
+    @Property(mappedBy="mentor")
+    IEmployee getProtege();
+    @Column(name="HRADVISOR")
+    IEmployee getHradvisor();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class)
+    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/companyAnnotatedPI/PIDSEmployee.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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
+ * the purpose of the interface.
+ */
+@PersistenceCapable
+@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+public interface PIDSFullTimeEmployee extends IFullTimeEmployee, PIDSEmployee {
+
+    @Column(name="SALARY")
+    double getSalary();
+    void setSalary(double salary);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,50 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+import org.apache.jdo.tck.pc.company.IEmployee;
+
+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
+ * the purpose of the interface.
+ */
+@PersistenceCapable(table="insuranceplans")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR", indexed="true")
+@Index(name="INS_DISCRIMINATOR_INDEX", unique="false",
+        columns=@Column(name="DISCRIMINATOR"))
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
+        column="DATASTORE_IDENTITY")
+public interface PIDSInsurance extends IInsurance {
+
+    @Column(name="INSID")
+    long getInsid();
+    @Column(name="CARRIER")
+    String getCarrier();
+    @Column(name="EMPLOYEE")
+    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/companyAnnotatedPI/PIDSInsurance.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,35 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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 PIDSMedicalInsurance extends IMedicalInsurance, PIDSInsurance {
+
+    @Column(name="PLANTYPE")
+    String getPlanType();
+    void setPlanType(String planType);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.companyAnnotatedPI;
+
+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
+ * the purpose of the interface.
+ */
+@PersistenceCapable
+@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+public interface PIDSPartTimeEmployee extends IPartTimeEmployee, PIDSEmployee {
+
+    @Column(name="WAGE")
+    double getWage();
+    void setWage(double wage);
+}

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

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,76 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+import java.util.Date;
+import java.util.Map;
+import org.apache.jdo.tck.pc.company.IAddress;
+
+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
+ * the purpose of the interface.
+ */
+@PersistenceCapable(table="persons")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR", indexed="true")
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
+        column="DATASTORE_IDENTITY")
+public interface PIDSPerson extends IPerson {
+
+    @Column(name="PERSONID")
+    long getPersonid();
+    @Column(name="LASTNAME")
+    String getLastname();
+    @Column(name="FIRSTNAME")
+    String getFirstname();
+    @Property(defaultFetchGroup="false")
+    @Column(name="MIDDLENAME", allowsNull="true")
+    String getMiddlename();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Embedded(nullIndicatorColumn="COUNTRY",
+        fields={
+            @Field(name="addrid", columns=@Column(name="ADDRID")),
+            @Field(name="street", columns=@Column(name="STREET")),
+            @Field(name="city", columns=@Column(name="CITY")),
+            @Field(name="state", columns=@Column(name="STATE")),
+            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Field(name="country", columns=@Column(name="COUNTRY"))
+    })
+    IAddress getAddress();
+    Date getBirthdate();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type")
+    @Join(column="EMPID")
+    @Key(types=java.lang.String.class)
+    @Value(types=java.lang.String.class)
+    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/companyAnnotatedPI/PIDSPerson.java
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java?view=auto&rev=557767
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java Thu Jul 19 13:52:29 2007
@@ -0,0 +1,65 @@
+/*
+ * 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.companyAnnotatedPI;
+
+import javax.jdo.annotations.*;
+
+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
+ * the purpose of the interface.
+ */
+@PersistenceCapable(table="projects")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+        column="DISCRIMINATOR")
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
+        column="DATASTORE_IDENTITY")
+public interface PIDSProject extends IProject {
+
+    @Column(name="PROJID")
+    long getProjid();
+    @Column(name="NAME")
+    String getName();
+    @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
+    BigDecimal getBudget();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
+            column="REVIEWER")
+    @Join(column="PROJID", table="proj_reviewer")
+    //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
+    Set getReviewers();
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPI.PIDSEmployee.class,
+            column="MEMBER")
+    //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.PIDSEmployee.class,
+    //    foreignKey=@ForeignKey(name="PR_REV_FK"))
+    @Join(column="PROJID", table="proj_member")
+    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/companyAnnotatedPI/PIDSProject.java
------------------------------------------------------------------------------
    svn:eol-style = LF



Mime
View raw message