[jboss-cvs] JBossAS SVN: r96048 - in projects/ejb3/trunk/jpa-int: src/main/java/org/jboss/ejb3/jpa/integration and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2009-11-05 06:58:35 -0500 (Thu, 05 Nov 2009)
New Revision: 96048

Modified:
   projects/ejb3/trunk/jpa-int/pom.xml
   projects/ejb3/trunk/jpa-int/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java
Log:
EJBTHREE-1931: updated jpa-api to 2.0-cr-1

Modified: projects/ejb3/trunk/jpa-int/pom.xml
===================================================================
--- projects/ejb3/trunk/jpa-int/pom.xml	2009-11-05 10:00:57 UTC (rev 96047)
+++ projects/ejb3/trunk/jpa-int/pom.xml	2009-11-05 11:58:35 UTC (rev 96048)
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.hibernate.java-persistence</groupId>
       <artifactId>jpa-api</artifactId>
-      <version>2.0.Beta-20090815</version>
+      <version>2.0-cr-1</version>
       <scope>provided</scope>
     </dependency>
 

Modified: projects/ejb3/trunk/jpa-int/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java
===================================================================
--- projects/ejb3/trunk/jpa-int/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java	2009-11-05 10:00:57 UTC (rev 96047)
+++ projects/ejb3/trunk/jpa-int/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java	2009-11-05 11:58:35 UTC (rev 96048)
@@ -22,14 +22,13 @@
 package org.jboss.ejb3.jpa.integration;
 
 import java.util.Map;
-import java.util.Set;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.LockModeType;
 import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.QueryBuilder;
 import javax.persistence.metamodel.Metamodel;
 
 /**
@@ -75,6 +74,11 @@
       return getEntityManager().find(entityClass, primaryKey, lockMode, properties);
    }
 
+   public CriteriaBuilder getCriteriaBuilder()
+   {
+      return getEntityManager().getCriteriaBuilder();
+   }
+   
    public EntityManagerFactory getEntityManagerFactory()
    {
       return getEntityManager().getEntityManagerFactory();
@@ -95,16 +99,6 @@
       return getEntityManager().getProperties();
    }
 
-   public QueryBuilder getQueryBuilder()
-   {
-      return getEntityManager().getQueryBuilder();
-   }
-
-   public Set<String> getSupportedProperties()
-   {
-      return getEntityManager().getSupportedProperties();
-   }
-
    public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
    {
       getEntityManager().lock(entity, lockMode, properties);