[hibernate-commits] Hibernate SVN: r16909 - in core/trunk/cache-jbosscache2: src/test/java/org/hibernate/test/cache/jbc2/functional and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-06-23 13:44:33 -0400 (Tue, 23 Jun 2009)
New Revision: 16909

Modified:
   core/trunk/cache-jbosscache2/pom.xml
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java
Log:
Get rid of redundant JPA annotations

Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml	2009-06-23 17:44:26 UTC (rev 16908)
+++ core/trunk/cache-jbosscache2/pom.xml	2009-06-23 17:44:33 UTC (rev 16909)
@@ -52,13 +52,6 @@
             <artifactId>javassist</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.hibernate.java-persistence</groupId>
-            <artifactId>jpa-api</artifactId>
-            <version>2.0.Beta2</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java	2009-06-23 17:44:26 UTC (rev 16908)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java	2009-06-23 17:44:33 UTC (rev 16909)
@@ -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/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java	2009-06-23 17:44:26 UTC (rev 16908)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java	2009-06-23 17:44:33 UTC (rev 16909)
@@ -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/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java	2009-06-23 17:44:26 UTC (rev 16908)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java	2009-06-23 17:44:33 UTC (rev 16909)
@@ -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={@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={@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={@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={@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={@QueryHint(name="org.hibernate.cacheable",value="true")}),
-//   @NamedQuery(name="account.bybranch.namedregion",query="select account from Account as account where account.branch = ?1",
-//               hints={@QueryHint(name="org.hibernate.cacheRegion",value="AccountRegion"),
-//                      @QueryHint(name="org.hibernate.cacheable",value="true")
-//                     })
 public class Account implements Serializable
 {