Author: bstansberry(a)jboss.com Date: 2009-06-23 12:21:35 -0400 (Tue, 23 Jun 2009) New Revision: 16903 Modified: core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java Log: Get rid of redundant JPA annotations Modified: core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java =================================================================== --- core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java 2009-06-23 12:59:27 UTC (rev 16902) +++ core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java 2009-06-23 16:21:35 UTC (rev 16903) @@ -24,9 +24,6 @@ package org.hibernate.test.cache.jbc2.functional; import java.io.Serializable; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; /** * Entity that has a many-to-one relationship to a Customer @@ -46,7 +43,6 @@ } - @Id public Integer getId() { return id; @@ -77,8 +73,6 @@ this.tlf = tlf; } - @ManyToOne - @JoinColumn(name="CUST_ID") public Customer getCustomer() { return customer; Modified: core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java =================================================================== --- core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java 2009-06-23 12:59:27 UTC (rev 16902) +++ core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java 2009-06-23 16:21:35 UTC (rev 16903) @@ -26,8 +26,6 @@ import java.io.Serializable; import java.util.Set; -import javax.persistence.Id; - /** * Company customer * @@ -47,7 +45,6 @@ { } - @Id public Integer getId() { return id; Modified: core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java =================================================================== --- core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java 2009-06-23 12:59:27 UTC (rev 16902) +++ core/branches/Branch_3_3/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java 2009-06-23 16:21:35 UTC (rev 16903) @@ -31,24 +31,6 @@ * @author Brian Stansberry * @version $Revision: 60233 $ */ -// @NamedQuery(name="account.totalbalance.default",query="select account.balance from Account as account where account.accountHolder = ?1", -// hints={(a)QueryHint(name="org.hibernate.cacheable",value="true")}), -// @NamedQuery(name="account.totalbalance.namedregion",query="select account.balance from Account as account where account.accountHolder = ?1", -// hints={(a)QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"), -// @QueryHint(name="org.hibernate.cacheable",value="true") -// }), -// @NamedQuery(name="account.branch.default",query="select account.branch from Account as account where account.accountHolder = ?1", -// hints={(a)QueryHint(name="org.hibernate.cacheable",value="true")}), -// @NamedQuery(name="account.branch.namedregion",query="select account.branch from Account as account where account.accountHolder = ?1", -// hints={(a)QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"), -// @QueryHint(name="org.hibernate.cacheable",value="true") -// }), -// @NamedQuery(name="account.bybranch.default",query="select account from Account as account where account.branch = ?1", -// hints={(a)QueryHint(name="org.hibernate.cacheable",value="true")}), -// @NamedQuery(name="account.bybranch.namedregion",query="select account from Account as account where account.branch = ?1", -// hints={(a)QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"), -// @QueryHint(name="org.hibernate.cacheable",value="true") -// }) public class Account implements Serializable {