Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 7650 invoked from network); 4 Jul 2007 18:13:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jul 2007 18:13:50 -0000 Received: (qmail 51075 invoked by uid 500); 4 Jul 2007 18:13:53 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 51063 invoked by uid 99); 4 Jul 2007 18:13:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 11:13:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 11:13:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B426F1A981A; Wed, 4 Jul 2007 11:13:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r553288 - in /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS: FCCompany.java FCDepartment.java FCInsurance.java FCPerson.java FCProject.java PICompany.java PIDepartment.java PIInsurance.java PIPerson.java PIProject.java Date: Wed, 04 Jul 2007 18:13:29 -0000 To: jdo-commits@db.apache.org From: clr@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070704181329.B426F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clr Date: Wed Jul 4 11:13:27 2007 New Revision: 553288 URL: http://svn.apache.org/viewvc?view=rev&rev=553288 Log: JDO-403 Removed @Table; added @DatastoreIdentity annotations to FC and PI Modified: 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/FCDepartment.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/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/PICompany.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/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=553288&r1=553287&r2=553288 ============================================================================== --- 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 Wed Jul 4 11:13:27 2007 @@ -40,13 +40,13 @@ /** * This class represents information about a company. */ -@PersistenceCapable +@PersistenceCapable(table="companies") @Implements ("org.apache.jdo.tck.pc.company.ICompany") -@Table(table="companies") @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR") -@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public class FCCompany implements ICompany, Serializable, Comparable, Comparator, DeepEquality { Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCDepartment.java Wed Jul 4 11:13:27 2007 @@ -37,13 +37,13 @@ /** * This class represents a department within a company. */ -@PersistenceCapable +@PersistenceCapable(table="departments") @Implements ("org.apache.jdo.tck.pc.company.IDepartment") -@Table(table="departments") @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR") -@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public class FCDepartment implements IDepartment, Serializable, Comparable, Comparator, DeepEquality { Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCInsurance.java Wed Jul 4 11:13:27 2007 @@ -32,15 +32,15 @@ * This class represents an insurance carrier selection for a particular * FCEmployee. */ -@PersistenceCapable +@PersistenceCapable(table="insuranceplans") @Implements ("org.apache.jdo.tck.pc.company.IInsurance") -@Table(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") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public class FCInsurance implements IInsurance, Serializable, Comparable, Comparator, DeepEquality { Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCPerson.java Wed Jul 4 11:13:27 2007 @@ -44,7 +44,8 @@ @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR", indexed="true") -@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public class FCPerson implements IPerson, Serializable, Comparable, Comparator, DeepEquality { Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/FCProject.java Wed Jul 4 11:13:27 2007 @@ -37,9 +37,8 @@ * This class represents a project, a budgeted task with one or more * employees working on it. */ -@PersistenceCapable +@PersistenceCapable(table="projects") @Implements ("org.apache.jdo.tck.pc.company.IProject") -@Table(table="projects") @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR") @@ -54,14 +53,14 @@ @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2) private BigDecimal budget; @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT, - table="proj_reviewer") + table="project_reviewer") @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.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="proj_member") + table="project_member") @Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class, column="MEMBER") //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedDS.FCEmployee.class, Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PICompany.java Wed Jul 4 11:13:27 2007 @@ -27,11 +27,12 @@ * Javadoc was deliberately omitted because it would distract from * the purpose of the interface. */ -@PersistenceCapable -@Table(table="companies") +@PersistenceCapable(table="companies") @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public interface PICompany { @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT) Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIDepartment.java Wed Jul 4 11:13:27 2007 @@ -26,12 +26,13 @@ * Javadoc was deliberately omitted because it would distract from * the purpose of the interface. */ -@PersistenceCapable +@PersistenceCapable(table="departments") @Implements ("org.apache.jdo.tck.pc.company.IDepartment") -@Table(table="departments") @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public interface PIDepartment { @Column(name="ID") Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIInsurance.java Wed Jul 4 11:13:27 2007 @@ -24,13 +24,14 @@ * Javadoc was deliberately omitted because it would distract from * the purpose of the interface. */ -@PersistenceCapable -@Table(table="insuranceplans") +@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 PIInsurance { @Column(name="INSID") Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIPerson.java Wed Jul 4 11:13:27 2007 @@ -27,11 +27,12 @@ * Javadoc was deliberately omitted because it would distract from * the purpose of the interface. */ -@PersistenceCapable -@Table(table="persons") +@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 PIPerson { @Column(name="PERSONID") @@ -55,9 +56,8 @@ }) PIAddress getAddress(); Date getBirthdate(); - @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT) + @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type") @Join(column="EMPID") - @JoinTable(table="employee_phoneno_type") @Key(types=java.lang.String.class) @Value(types=java.lang.String.class) Map getPhoneNumbers(); Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java?view=diff&rev=553288&r1=553287&r2=553288 ============================================================================== --- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java (original) +++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedDS/PIProject.java Wed Jul 4 11:13:27 2007 @@ -26,14 +26,14 @@ * Javadoc was deliberately omitted because it would distract from * the purpose of the interface. */ -@PersistenceCapable -@Table(table="projects") +@PersistenceCapable(table="projects") @Inheritance(strategy=InheritanceStrategy.NEW_TABLE) @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR") +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, + column="DATASTORE_IDENTITY") public interface PIProject { - @Property(primaryKey="true") @Column(name="PROJID") long getProjid(); @Column(name="NAME")