You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openjpa.apache.org by Michael Dick <mi...@gmail.com> on 2009/05/11 15:33:18 UTC

Re: svn commit: r773314 [1/2] - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/

Hi Fay,

Could you add the svn:eol-style property for the files you've added?

You can do this with the command line client by running:
$ svn ps svn:eol-style native ${file}
for each file you added.

Thanks,

-mike

On Sun, May 10, 2009 at 3:25 AM, <fa...@apache.org> wrote:

> Author: faywang
> Date: Sun May 10 08:25:24 2009
> New Revision: 773314
>
> URL: http://svn.apache.org/viewvc?rev=773314&view=rev
> Log:
> OPENJPA-1013: check in strictly-typed criteria test cases.
>
> Added:
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CustomerDetails.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore_.java
> Modified:
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
>
>  openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java
> Sun May 10 08:25:24 2009
> @@ -30,14 +30,50 @@
>  *
>  */
>  @Entity
> -@Table(name="CR_ACCOUNT")
> +@Table(name="CR_ACCT")
>  public class Account {
> -       @Id
> -       @GeneratedValue
> -       private long id;
> -
> -       private int balance;
> -       private Integer loan;
> -       private String owner;
> -       private String name;
> +    @Id
> +    @GeneratedValue
> +    private long id;
> +
> +    private int balance;
> +    private Integer loan;
> +    private String owner;
> +    private String name;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public String getOwner() {
> +        return owner;
> +    }
> +
> +    public void setOwner(String owner) {
> +        this.owner = owner;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public int getBalance() {
> +        return balance;
> +    }
> +
> +    public void setBalancey(int balance) {
> +        this.balance = balance;
> +    }
> +
> +    public Integer getLoan() {
> +        return loan;
> +    }
> +
> +    public void setLoan(Integer loan) {
> +        this.loan = loan;
> +    }
>  }
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address.java
> Sun May 10 08:25:24 2009
> @@ -33,14 +33,69 @@
>  *
>  */
>  @Entity
> -@Table(name="CR_ADDRESS")
> +@Table(name="CR_ADDR")
>  @Embeddable
>  public class Address {
>        @Id
>        @GeneratedValue
>        private long id;
> -
> +
> +       private String street;
> +       private String city;
>        private String state;
>        private String county;
> +    private String country;
>        private String zipCode;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public String getStreet() {
> +        return street;
> +    }
> +
> +    public void setStreet(String street) {
> +        this.street = street;
> +    }
> +
> +    public String getCity() {
> +        return city;
> +    }
> +
> +    public void setCity(String city) {
> +        this.city = city;
> +    }
> +
> +    public String getCounty() {
> +        return county;
> +    }
> +
> +    public void setCounty(String county) {
> +        this.county = county;
> +    }
> +
> +    public String getState() {
> +        return state;
> +    }
> +
> +    public void setState(String state) {
> +        this.state = state;
> +    }
> +
> +    public String getZipcode() {
> +        return zipCode;
> +    }
> +
> +    public String getCountry() {
> +        return country;
> +    }
> +
> +    public void setCountry(String country) {
> +        this.country = country;
> +    }
> +
> +    public void setZipcode(String zipCode) {
> +        this.zipCode = zipCode;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,19 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Address.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Address_ {
> +    public static volatile Attribute<Address,String> city;
> +    public static volatile Attribute<Address,String> country;
> +    public static volatile Attribute<Address,String> county;
> +    public static volatile Attribute<Address,Long> id;
> +    public static volatile Attribute<Address,String> state;
> +    public static volatile Attribute<Address,String> street;
> +    public static volatile Attribute<Address,String> zipCode;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact.java
> Sun May 10 08:25:24 2009
> @@ -31,4 +31,20 @@
>
>        @OneToMany
>        private List<Phone> phones;
> +
> +    public List<Phone> getPhones() {
> +        return phones;
> +    }
> +
> +    public void addPhone(Phone phone) {
> +        phones.add(phone);
> +    }
> +
> +    public Address getAddress() {
> +        return address;
> +    }
> +
> +    public void setAddress(Address address) {
> +        this.address = address;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,15 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.List;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Contact.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Contact_ {
> +    public static volatile Attribute<Contact,Address> address;
> +    public static volatile List<Contact,Phone> phones;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor.java
> Sun May 10 08:25:24 2009
> @@ -20,6 +20,7 @@
>
>  import javax.persistence.Entity;
>
> +
>  @Entity
>  public class Contractor extends Person {
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,11 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Contractor.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Contractor_ extends Person_  {
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course.java
> Sun May 10 08:25:24 2009
> @@ -21,17 +21,47 @@
>  import java.util.List;
>
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.OneToMany;
>  import javax.persistence.OrderBy;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_COURSE")
> +@Table(name="CR_CRSE")
>
>  public class Course {
> -       private String name;
> -
> -       @OneToMany
> -       @OrderBy
> -       private List<Student> studentWaitList;
> +    @Id
> +    @GeneratedValue
> +    private long id;
> +
> +    private String name;
> +
> +    @OneToMany
> +    @OrderBy
> +    private List<Student> studentWaitList;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public List<Student> getStudentWaitList() {
> +        return studentWaitList;
> +    }
> +
> +    public void setStudentWaitList(List<Student> studentWaitList) {
> +        this.studentWaitList = studentWaitList;
> +    }
> +
> +    public void addStudentToWaitList(Student student) {
> +        studentWaitList.add(student);
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.List;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Course.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Course_ {
> +    public static volatile Attribute<Course,Long> id;
> +    public static volatile Attribute<Course,String> name;
> +    public static volatile List<Course,Student> studentWaitList;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard.java
> Sun May 10 08:25:24 2009
> @@ -21,19 +21,48 @@
>  import java.util.List;
>
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.OneToMany;
>  import javax.persistence.OneToOne;
>  import javax.persistence.OrderBy;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_CREDITCARD")
> -
> +@Table(name="CR_CRDTC")
>  public class CreditCard {
> -       @OneToOne
> -       private Employee holder;
> +    @Id
> +    @GeneratedValue
> +    private long id;
> +
> +    @OneToOne
> +       private Customer customer;
>
>        @OneToMany
>        @OrderBy
> -       private List<Transaction> transactionHistory;
> +       private List<TransactionHistory> transactionHistory;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public List<TransactionHistory> getTransactionHistory() {
> +        return transactionHistory;
> +    }
> +
> +    public void setTransactionHistory(List<TransactionHistory>
> transactionHistory) {
> +        this.transactionHistory = transactionHistory;
> +    }
> +
> +    public void addTransactionHistory(TransactionHistory transaction) {
> +        transactionHistory.add(transaction);
> +    }
> +
> +    public Customer getCustomer() {
> +        return customer;
> +    }
> +
> +    public void setCustomerr(Customer customer) {
> +        this.customer = customer;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.List;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.CreditCard.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class CreditCard_ {
> +    public static volatile Attribute<CreditCard,Customer> customer;
> +    public static volatile Attribute<CreditCard,Long> id;
> +    public static volatile List<CreditCard,TransactionHistory>
> transactionHistory;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
> Sun May 10 08:25:24 2009
> @@ -18,38 +18,131 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> +import java.util.ArrayList;
> +import java.util.HashSet;
>  import java.util.List;
>  import java.util.Set;
>
>  import javax.persistence.Entity;
> -import javax.persistence.ManyToOne;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.OneToMany;
>  import javax.persistence.OneToOne;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_CUSTOMER")
> -
> +@Table(name="CR_CUST")
>  public class Customer {
> +    @Id
> +    @GeneratedValue
>        private long id;
> +
>        private String firstName;
>        private String lastName;
> +       private String name;
> +
>        @OneToMany
> -       private Set<Order> orders;
> +       private Set<Order> orders = new HashSet<Order>();
> +
>        private int status;
> -       private int balanceOwned;
> +       private int balanceOwed;
> +
>        @OneToOne
>        private Address address;
>
>        private int filledOrderCount;
> -       private String country;
> +
> +    private long accountNum;
>
>        @OneToMany
> -       private List<Account> accounts;
> +       private List<Account> accounts = new ArrayList<Account>();
>
> -       public Customer() {
> -
> -       }
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public String getFirstName() {
> +        return firstName;
> +    }
> +
> +    public void setFirstName(String firstName) {
> +        this.firstName = firstName;
> +    }
> +
> +    public String getLastName() {
> +        return lastName;
> +    }
> +
> +    public void setLastName(String lastName) {
> +        this.lastName = lastName;
> +    }
> +
> +    public Set<Order> getOrders() {
> +        return orders;
> +    }
> +
> +    public void setOrders(Set<Order> orders) {
> +        this.orders = orders;
> +    }
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public Address getAddress() {
> +        return address;
> +    }
> +
> +    public void setAddress(Address address) {
> +        this.address = address;
> +    }
> +
> +    public int getStatus() {
> +        return status;
> +    }
> +
> +    public void setStatus(int status) {
> +        this.status = status;
> +    }
> +
> +    public long getAccountNum() {
> +        return accountNum;
> +    }
> +
> +    public void setAccountNum(long accountNum) {
> +        this.accountNum = accountNum;
> +    }
> +
> +    public int getBalanceOwed() {
> +        return balanceOwed;
> +    }
> +
> +    public void setBalanceOwed(int balanceOwed) {
> +        this.balanceOwed = balanceOwed;
> +    }
> +
> +    public int getFilledOrderCount() {
> +        return filledOrderCount;
> +    }
> +
> +    public void setFilledOrderCount(int filledOrderCount) {
> +        this.filledOrderCount = filledOrderCount;
> +    }
> +
> +    public List<Account> getAccounts() {
> +        return accounts;
> +    }
> +
> +    public void setAccounts(List<Account> accounts) {
> +        this.accounts = accounts;
> +    }
> +
> +
> +
>
>        public Customer(long id, int status, int count) {
>
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CustomerDetails.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CustomerDetails.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CustomerDetails.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CustomerDetails.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,53 @@
> +/*
> + * 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.openjpa.persistence.criteria;
> +
> +public class CustomerDetails {
> +    int id;
> +
> +    int status;
> +
> +    int quantity;
> +
> +    public int getStatus() {
> +        return status;
> +    }
> +
> +    public void setStatus(int status) {
> +        this.status = status;
> +    }
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public void setId(int id) {
> +        this.id = id;
> +    }
> +
> +    public int getQuantity() {
> +        return quantity;
> +    }
> +
> +    public void setQuantity(int quantity) {
> +        this.quantity = quantity;
> +    }
> +
> +}
> +
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,25 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.List;
> +import javax.persistence.metamodel.Set;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Customer.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Customer_ {
> +    public static volatile Attribute<Customer,Long> accountNum;
> +    public static volatile List<Customer,Account> accounts;
> +    public static volatile Attribute<Customer,Address> address;
> +    public static volatile Attribute<Customer,Integer> balanceOwed;
> +    public static volatile Attribute<Customer,Integer> filledOrderCount;
> +    public static volatile Attribute<Customer,String> firstName;
> +    public static volatile Attribute<Customer,Long> id;
> +    public static volatile Attribute<Customer,String> lastName;
> +    public static volatile Attribute<Customer,String> name;
> +    public static volatile Set<Customer,Order> orders;
> +    public static volatile Attribute<Customer,Integer> status;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department.java
> Sun May 10 08:25:24 2009
> @@ -21,15 +21,44 @@
>  import java.util.Set;
>
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.OneToMany;
>  import javax.persistence.Table;
>
> +
>  @Entity
> -@Table(name="CR_DEPARTMENT")
> +@Table(name="CR_DEPT")
>
>  public class Department {
> +    @Id
> +    @GeneratedValue
>        private int deptNo;
>        private String name;
>        @OneToMany
>        private Set<Employee> employees;
> +
> +    public int getDeptno() {
> +        return deptNo;
> +    }
> +
> +    public void setDeptno(int deptNo) {
> +        this.deptNo = deptNo;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public Set<Employee> getEmployees() {
> +        return employees;
> +    }
> +
> +    public void setEmployees(Set<Employee> employees){
> +        this.employees = employees;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.Set;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Department.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Department_ {
> +    public static volatile Attribute<Department,Integer> deptNo;
> +    public static volatile Set<Department,Employee> employees;
> +    public static volatile Attribute<Department,String> name;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee.java
> Sun May 10 08:25:24 2009
> @@ -18,29 +18,104 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> +import javax.persistence.Basic;
> +import javax.persistence.DiscriminatorColumn;
>  import javax.persistence.Embedded;
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
> +import javax.persistence.Inheritance;
>  import javax.persistence.ManyToOne;
>  import javax.persistence.OneToOne;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_EMPLOYEE")
> -
> +@Table(name="CR_EMP")
> +@Inheritance
> +@DiscriminatorColumn(name="EMP_TYPE")
>  public class Employee {
> +    @Id
> +    @GeneratedValue
> +    private int empId;
> +
>        private String name;
>        @Embedded
>        private Contact contactInfo;
>        @ManyToOne
>        private Department department;
> -       private int rating;
> -       private float salary;
> +
>        @OneToOne
>        private Employee spouse;
>        @ManyToOne
>        private Manager manager;
>
>        @OneToOne
> -       FrequentFlierPlan frequentFlierPlan;
> +       private FrequentFlierPlan frequentFlierPlan;
>
> +    @Basic
> +    private long salary;
> +
> +    @Basic
> +    private int rating;
> +
> +
> +    public int getEmpId() {
> +        return empId;
> +    }
> +
> +    public void setContactInfo(Contact contactInfo) {
> +        this.contactInfo = contactInfo;
> +    }
> +
> +    public Contact getContactInfo() {
> +        return contactInfo;
> +    }
> +
> +    public void setDepartment(Department department) {
> +        this.department = department;
> +    }
> +
> +    public Department getDepartment() {
> +        return department;
> +    }
> +
> +    public void setSpouse(Employee spouse) {
> +        this.spouse = spouse;
> +    }
> +
> +    public Employee getSpouse() {
> +        return spouse;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public void setManager(Manager manager) {
> +        this.manager = manager;
> +    }
> +
> +    public Manager getManager() {
> +        return manager;
> +    }
> +
> +    public void setSalary(long salary) {
> +        this.salary = salary;
> +    }
> +
> +    public long getSalary() {
> +        return salary;
> +    }
> +
> +    public void setRating(int rating) {
> +        this.rating = rating;
> +    }
> +
> +    public long getRating() {
> +        return rating;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,21 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Employee.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Employee_ {
> +    public static volatile Attribute<Employee,Contact> contactInfo;
> +    public static volatile Attribute<Employee,Department> department;
> +    public static volatile Attribute<Employee,Integer> empId;
> +    public static volatile Attribute<Employee,FrequentFlierPlan>
> frequentFlierPlan;
> +    public static volatile Attribute<Employee,Manager> manager;
> +    public static volatile Attribute<Employee,String> name;
> +    public static volatile Attribute<Employee,Integer> rating;
> +    public static volatile Attribute<Employee,Long> salary;
> +    public static volatile Attribute<Employee,Employee> spouse;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt.java
> Sun May 10 08:25:24 2009
> @@ -18,17 +18,22 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> +import java.util.Date;
> +
> +import javax.persistence.Basic;
>  import javax.persistence.Entity;
> -import javax.persistence.GeneratedValue;
> -import javax.persistence.Id;
> -import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_EXEMPT")
> -
> -public class Exempt {
> -    @Id
> -    @GeneratedValue
> -    private String id;
> -
> +public class Exempt extends Employee {
> +    @Basic
> +    private Date hireDate;
> +
> +    public void setHireDate(Date hireDate) {
> +        this.hireDate = hireDate;
> +    }
> +
> +    public Date getHireDate() {
> +        return hireDate;
> +    }
> +
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,14 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import java.util.Date;
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Exempt.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Exempt_ extends Employee_  {
> +    public static volatile Attribute<Exempt,Date> hireDate;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item.java
> Sun May 10 08:25:24 2009
> @@ -21,15 +21,50 @@
>  import java.util.Map;
>
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.OneToMany;
> -import javax.persistence.OneToOne;
>  import javax.persistence.Table;
>
>  @Entity
>  @Table(name="CR_ITEM")
> -
>  public class Item {
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
>        private String name;
> -       @OneToMany
> +
> +    @OneToMany
>        private Map<String, Photo> photos;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public Map<String, Photo> getPhotos() {
> +        return photos;
> +    }
> +
> +    public void addPhoto(String name, Photo photo) {
> +        photos.put(name, photo);
> +    }
> +
> +    public void removePhoto(String name) {
> +        photos.remove(name);
> +    }
> +
> +    public Photo getPhoto(String name) {
> +        return photos.get(name);
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.Map;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Item.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Item_ {
> +    public static volatile Attribute<Item,Integer> id;
> +    public static volatile Attribute<Item,String> name;
> +    public static volatile Map<Item,String,Photo> photos;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem.java
> Sun May 10 08:25:24 2009
> @@ -19,14 +19,74 @@
>  package org.apache.openjpa.persistence.criteria;
>
>  import javax.persistence.Entity;
> +import javax.persistence.FetchType;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.ManyToOne;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_LINEITEM")
> +@Table(name="CR_LI")
>
>  public class LineItem {
> -       private int price;
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
> +    private double price;
> +
>        @ManyToOne
>        private Order order;
> +
> +    private int quantity;
> +
> +    private double cost;
> +
> +    @ManyToOne (fetch=FetchType.EAGER)
> +    Product product;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public Order getOrder() {
> +        return order;
> +    }
> +
> +    public void setOrder(Order order) {
> +        this.order = order;
> +    }
> +
> +    public double getPrice() {
> +        return price;
> +    }
> +
> +    public void setPrice(double price) {
> +        this.price = price;
> +    }
> +
> +    public double getCost() {
> +        return cost;
> +    }
> +
> +    public void setCost(double cost) {
> +        this.cost = cost;
> +    }
> +
> +    public Product getProduct() {
> +        return product;
> +    }
> +
> +    public void setProduct(Product product) {
> +        this.product = product;
> +    }
> +
> +    public int getQuantity() {
> +        return quantity;
> +    }
> +
> +    public void setQuantity(int quantity) {
> +        this.quantity = quantity;
> +    }
> +
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,18 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.LineItem.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class LineItem_ {
> +    public static volatile Attribute<LineItem,Double> cost;
> +    public static volatile Attribute<LineItem,Integer> id;
> +    public static volatile Attribute<LineItem,Order> order;
> +    public static volatile Attribute<LineItem,Double> price;
> +    public static volatile Attribute<LineItem,Product> product;
> +    public static volatile Attribute<LineItem,Integer> quantity;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager.java
> Sun May 10 08:25:24 2009
> @@ -18,11 +18,54 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> +import java.math.BigDecimal;
> +
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
> +import javax.persistence.ManyToOne;
>  import javax.persistence.Table;
>
>  @Entity
> +@Table(name="CR_MGR")
> +public class Manager {
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
> +    private String name;
> +
> +    private BigDecimal salary;
> +
> +    @ManyToOne
> +    private Department department;
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public void setDepartment(Department department) {
> +        this.department = department;
> +    }
> +
> +    public Department getDepartment() {
> +        return department;
> +    }
> +
> +    public BigDecimal getSalary() {
> +        return salary;
> +    }
> +
> +    public void setSalary(BigDecimal salary) {
> +        this.salary = salary;
> +    }
>
> -public class Manager extends Employee {
> -    private String cabin;
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,17 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import java.math.BigDecimal;
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Manager.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Manager_ {
> +    public static volatile Attribute<Manager,Department> department;
> +    public static volatile Attribute<Manager,Integer> id;
> +    public static volatile Attribute<Manager,String> name;
> +    public static volatile Attribute<Manager,BigDecimal> salary;
> +}
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,43 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one
> + * or more contributor license agreements.  See the NOTICE file
> + * distributed with this work for additional information
> + * regarding copyright ownership.  The ASF licenses this file
> + * to you under the Apache License, Version 2.0 (the
> + * "License"); you may not use this file except in compliance
> + * with the License.  You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing,
> + * software distributed under the License is distributed on an
> + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> + * KIND, either express or implied.  See the License for the
> + * specific language governing permissions and limitations
> + * under the License.
> + */
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.*;
> +
> +@Entity
> +@Table(name="CR_MV")
> +public class Movie {
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
> +    private String title;
> +
> +    public long getId() {
> +        return id;
> +    }
> +
> +    public String getTitle() {
> +        return title;
> +    }
> +
> +    public void setTitle(String title) {
> +        this.title = title;
> +    }
> +}
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,14 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Movie.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Movie_ {
> +    public static volatile Attribute<Movie,Integer> id;
> +    public static volatile Attribute<Movie,String> title;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
> Sun May 10 08:25:24 2009
> @@ -21,21 +21,64 @@
>  import java.util.List;
>
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.ManyToOne;
>  import javax.persistence.OneToMany;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_ORDER")
> +@Table(name="CR_ODR")
>  public class Order {
> -       private int quantity;
> -       private int cost;
> -       private int totalcost;
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
> +    private int quantity;
> +       private double totalCost;
>        private int count;
> +
>        @ManyToOne
>        private Customer customer;
>
>        @OneToMany(mappedBy="order")
>        private List<LineItem> lineItems;
> +
> +    public double getTotalCost() {
> +        return totalCost;
> +    }
> +
> +    public void setTotalCost(double totalCost) {
> +        this.totalCost = totalCost;
> +    }
> +
> +    public Customer getCustomer() {
> +        return customer;
> +    }
> +
> +    public void setCustomer(Customer customer) {
> +        this.customer = customer;
> +    }
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public List<LineItem> getLineItems() {
> +        return lineItems;
> +    }
> +
> +    public void setLineitems(List<LineItem> lineItems) {
> +        this.lineItems = lineItems;
> +    }
> +
> +    public int getQuantity() {
> +        return quantity;
> +    }
> +
> +    public void setQuantity(int quantity) {
> +        this.quantity = quantity;
> +    }
> +
>
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,19 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.List;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Order.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Order_ {
> +    public static volatile Attribute<Order,Integer> count;
> +    public static volatile Attribute<Order,Customer> customer;
> +    public static volatile Attribute<Order,Integer> id;
> +    public static volatile List<Order,LineItem> lineItems;
> +    public static volatile Attribute<Order,Integer> quantity;
> +    public static volatile Attribute<Order,Double> totalCost;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person.java
> Sun May 10 08:25:24 2009
> @@ -18,22 +18,48 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> -import java.util.List;
> +import java.util.Set;
>
> +import javax.persistence.ElementCollection;
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
>  import javax.persistence.Id;
> -import javax.persistence.OneToMany;
>  import javax.persistence.Table;
>
> -import org.apache.openjpa.persistence.PersistentCollection;
> -
>  @Entity
> -@Table(name="CR_PERSON")
> +@Table(name="CR_PSN")
>
>  public class Person {
>     @Id
> -    private long ssn;
> +    @GeneratedValue
> +    private int id;
> +
> +    private String name;
> +
> +       @ElementCollection
> +       private Set<String> nickNames;
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public Set<String> getNickNames() {
> +        return nickNames;
> +    }
> +
> +    public void setNickNames(Set<String> nickNames) {
> +        this.nickNames = nickNames;
> +    }
>
> -       @PersistentCollection
> -       private List<String> nicknames;
> +    public void addNickName(String nickName) {
> +        nickNames.add(nickName);
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.Set;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Person.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Person_ {
> +    public static volatile Attribute<Person,Integer> id;
> +    public static volatile Attribute<Person,String> name;
> +    public static volatile Set<Person,String> nickNames;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
> Sun May 10 08:25:24 2009
> @@ -18,12 +18,44 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> +import java.util.ArrayList;
> +import java.util.Collection;
> +
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
> +import javax.persistence.ManyToMany;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_PHONE")
> -
> +@Table(name="CR_PHN")
>  public class Phone {
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
> +    @ManyToMany
> +    private Collection<Employee> employees = new ArrayList<Employee>();
> +
>        private String vendor;
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public Collection<Employee> getEmployees() {
> +        return employees;
> +    }
> +
> +    public void addEmployees(Employee employee) {
> +        employees.add(employee);
> +    }
> +
> +    public String getVendor() {
> +        return vendor;
> +    }
> +
> +    public void setVendor(String vendor) {
> +        this.vendor = vendor;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.Collection;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Phone.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Phone_ {
> +    public static volatile Collection<Phone,Employee> employees;
> +    public static volatile Attribute<Phone,Integer> id;
> +    public static volatile Attribute<Phone,String> vendor;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo.java
> Sun May 10 08:25:24 2009
> @@ -19,11 +19,29 @@
>  package org.apache.openjpa.persistence.criteria;
>
>  import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_PHOTO")
> +@Table(name="CR_PHT")
>
>  public class Photo {
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
>        private String label;
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public String getLabel() {
> +        return label;
> +    }
> +
> +    public void setLabel(String label) {
> +        this.label = label;
> +    }
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,14 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Photo.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Photo_ {
> +    public static volatile Attribute<Photo,Integer> id;
> +    public static volatile Attribute<Photo,String> label;
> +}
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
> Sun May 10 08:25:24 2009
> @@ -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.openjpa.persistence.criteria;
> +import javax.persistence.*;
> +
> +@Entity
> +public class Product {
> +       @Id
> +       @GeneratedValue(strategy=GenerationType.IDENTITY)
> +       private int pid;
> +
> +       private String productType;
> +
> +       @Version
> +       private long version;
> +
> +       public String getProductType() {
> +               return productType;
> +       }
> +
> +       public void setProductType(String productType) {
> +               this.productType = productType;
> +       }
> +
> +       public int getPid() {
> +               return pid;
> +       }
> +}
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,15 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Product.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Product_ {
> +    public static volatile Attribute<Product,Integer> pid;
> +    public static volatile Attribute<Product,String> productType;
> +    public static volatile Attribute<Product,Long> version;
> +}
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester.java
> Sun May 10 08:25:24 2009
> @@ -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.openjpa.persistence.criteria;
> +
> +import javax.persistence.Entity;
> +import javax.persistence.GeneratedValue;
> +import javax.persistence.Id;
> +import javax.persistence.Table;
> +
> +@Entity
> +@Table(name="CR_SMT")
> +public class Semester {
> +    @Id
> +    @GeneratedValue
> +    private int id;
> +
> +    private String name;
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +}
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,14 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Semester.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Semester_ {
> +    public static volatile Attribute<Semester,Integer> id;
> +    public static volatile Attribute<Semester,String> name;
> +}
>
> Modified:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java?rev=773314&r1=773313&r2=773314&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
> (original)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
> Sun May 10 08:25:24 2009
> @@ -18,16 +18,54 @@
>  */
>  package org.apache.openjpa.persistence.criteria;
>
> +import java.util.HashMap;
> +import java.util.Map;
> +
>  import javax.persistence.Entity;
>  import javax.persistence.GeneratedValue;
>  import javax.persistence.Id;
> +import javax.persistence.JoinColumn;
> +import javax.persistence.JoinTable;
> +import javax.persistence.ManyToMany;
> +import javax.persistence.MapKeyJoinColumn;
>  import javax.persistence.Table;
>
>  @Entity
> -@Table(name="CR_STUDENT")
> +@Table(name="CR_STU")
>
>  public class Student {
>     @Id
> +    @GeneratedValue
> +    private int id;
> +
>     private String name;
> +
> +    @ManyToMany
> +    @JoinTable(name="ENROLLMENTS",
> +        joinColumns=@JoinColumn(name="STUDENT"),
> +        inverseJoinColumns=@JoinColumn(name="SEMESTER"))
> +    @MapKeyJoinColumn(name="COURSE")
> +    private Map<Course, Semester> enrollment =
> +        new HashMap<Course, Semester>();
> +
> +    public int getId() {
> +        return id;
> +    }
> +
> +    public String getName() {
> +        return name;
> +    }
> +
> +    public void setName(String name) {
> +        this.name = name;
> +    }
> +
> +    public Map getEnrollment() {
> +        return enrollment;
> +    }
> +
> +    public void addToEnrollment(Course course, Semester semester) {
> +        enrollment.put(course, semester);
> +    }
>
>  }
>
> Added:
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java?rev=773314&view=auto
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java
> (added)
> +++
> openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java
> Sun May 10 08:25:24 2009
> @@ -0,0 +1,16 @@
> +/**
> + *  Generated by OpenJPA MetaModel Generator Tool.
> +**/
> +
> +package org.apache.openjpa.persistence.criteria;
> +
> +import javax.persistence.metamodel.Attribute;
> +import javax.persistence.metamodel.Map;
> +
>
> +@javax.persistence.metamodel.TypesafeMetamodel(value=org.apache.openjpa.persistence.criteria.Student.class)
> +@javax.annotation.Generated(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sat
> May 09 23:22:02 PDT 2009")
> +public class Student_ {
> +    public static volatile Map<Student,Course,Semester> enrollment;
> +    public static volatile Attribute<Student,Integer> id;
> +    public static volatile Attribute<Student,String> name;
> +}
>
>
>