geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r907220 - in /geronimo/server/trunk: ./ plugins/openjpa2/ plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/ ...
Date Sat, 06 Feb 2010 14:25:27 GMT
Author: dwoods
Date: Sat Feb  6 14:25:27 2010
New Revision: 907220

URL: http://svn.apache.org/viewvc?rev=907220&view=rev
Log:
GERONIMO-4680 Upgrade to OpenJPA-2.0.0-beta which passed the JPA 2.0 TCK

Modified:
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
Sat Feb  6 14:25:27 2010
@@ -28,7 +28,7 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.metamodel.Metamodel;
 
 /**
@@ -169,8 +169,8 @@
     }
 
     @Override
-    public QueryBuilder getQueryBuilder() {
-        return getEntityManager().getQueryBuilder();
+    public CriteriaBuilder getCriteriaBuilder() {
+        return getEntityManager().getCriteriaBuilder();
     }
 
     @Override
@@ -224,11 +224,6 @@
     }
 
     @Override
-    public Set<String> getSupportedProperties() {
-        return getEntityManager().getSupportedProperties();
-    }
-
-    @Override
     public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
         getEntityManager().lock(entity, lockMode, properties);
     }

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
Sat Feb  6 14:25:27 2010
@@ -395,14 +395,14 @@
     }
 
     @Override
-    public QueryBuilder getQueryBuilder() {
+    public CriteriaBuilder getCriteriaBuilder() {
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {
-            return entityManager.getQueryBuilder();
+            return entityManager.getCriteriaBuilder();
         } else {
             entityManager = createEntityManager();
             try {
-                return entityManager.getQueryBuilder();
+                return entityManager.getCriteriaBuilder();
             } finally {
                 entityManager.close();
             }
@@ -550,21 +550,6 @@
     }
 
     @Override
-    public Set<String> getSupportedProperties() {
-        EntityManager entityManager = getEntityManager(false);
-        if (entityManager != null) {
-            return entityManager.getSupportedProperties();
-        } else {
-            entityManager = createEntityManager();
-            try {
-                return entityManager.getSupportedProperties();
-            } finally {
-                entityManager.close();
-            }
-        }
-    }
-
-    @Override
     public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
Sat Feb  6 14:25:27 2010
@@ -200,8 +200,8 @@
     }
 
     @Override
-    public QueryBuilder getQueryBuilder() {
-        return entityManager.getQueryBuilder();
+    public CriteriaBuilder getCriteriaBuilder() {
+        return entityManager.getCriteriaBuilder();
     }
 
     @Override
@@ -255,11 +255,6 @@
     }
 
     @Override
-    public Set<String> getSupportedProperties() {
-        return entityManager.getSupportedProperties();
-    }
-
-    @Override
     public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
         entityManager.lock(entity, lockMode, properties);
     }

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
Sat Feb  6 14:25:27 2010
@@ -190,11 +190,6 @@
     }
 
     @Override
-    public Set<String> getSupportedHints() {
-        return query.getSupportedHints();
-    }
-
-    @Override
     public boolean isBound(Parameter<?> param) {
         return query.isBound(param);
     }

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
Sat Feb  6 14:25:27 2010
@@ -36,8 +36,8 @@
 import javax.persistence.spi.PersistenceProvider;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.persistence.spi.SharedCacheMode;
-import javax.persistence.spi.ValidationMode;
+import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
 import javax.resource.ResourceException;
 import javax.sql.DataSource;
 

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
Sat Feb  6 14:25:27 2010
@@ -20,8 +20,8 @@
 import java.io.File;
 
 import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.SharedCacheMode;
-import javax.persistence.spi.ValidationMode;
+import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
 
 import junit.framework.TestCase;
 

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
Sat Feb  6 14:25:27 2010
@@ -28,7 +28,7 @@
 import javax.persistence.EntityTransaction;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.metamodel.Metamodel;
 
 /**
@@ -212,13 +212,7 @@
     }
 
     @Override
-    public QueryBuilder getQueryBuilder() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public Set<String> getSupportedProperties() {
+    public CriteriaBuilder getCriteriaBuilder() {
         // TODO Auto-generated method stub
         return null;
     }
@@ -227,32 +221,27 @@
     public void lock(Object entity, LockModeType lockMode,
         Map<String, Object> properties) {
         // TODO Auto-generated method stub
-        
     }
 
     @Override
     public void refresh(Object entity, Map<String, Object> properties) {
         // TODO Auto-generated method stub
-        
     }
 
     @Override
     public void refresh(Object entity, LockModeType lockMode) {
         // TODO Auto-generated method stub
-        
     }
 
     @Override
     public void refresh(Object entity, LockModeType lockMode,
         Map<String, Object> properties) {
         // TODO Auto-generated method stub
-        
     }
 
     @Override
     public void setProperty(String propertyName, Object value) {
         // TODO Auto-generated method stub
-        
     }
 
     @Override

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
Sat Feb  6 14:25:27 2010
@@ -24,7 +24,7 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.metamodel.Metamodel;
 
 /**
@@ -84,14 +84,9 @@
     }
 
     @Override
-    public QueryBuilder getQueryBuilder() {
+    public CriteriaBuilder getCriteriaBuilder() {
         // TODO Auto-generated method stub
         return null;
     }
 
-    @Override
-    public Set<String> getSupportedProperties() {
-        // TODO Auto-generated method stub
-        return null;
-    }
 }

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Sat Feb  6 14:25:27 2010
@@ -45,7 +45,7 @@
 
 <!-- These are in the geronimo-parent PM for now
     <properties>
-        <openjpaVersion>2.0.0-M3</openjpaVersion>
+        <openjpaVersion>2.0.0-beta</openjpaVersion>
     </properties>
 
     <dependencyManagement>
@@ -127,13 +127,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.0-PFD2</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-validation_1.0_spec</artifactId>
-                <version>1.0-CR5</version>
+                <version>1.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=907220&r1=907219&r2=907220&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Feb  6 14:25:27 2010
@@ -67,7 +67,7 @@
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>3.1.3-SNAPSHOT</openejbVersion>
-        <openjpaVersion>2.0.0-M3</openjpaVersion>
+        <openjpaVersion>2.0.0-beta</openjpaVersion>
         <derbyVersion>10.5.3.0_1</derbyVersion>
         <cxfVersion>2.1.4</cxfVersion>
         <axis2Version>1.5</axis2Version>
@@ -231,13 +231,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.0-PFD2</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-validation_1.0_spec</artifactId>
-                <version>1.0-CR5</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>
@@ -427,6 +427,10 @@
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-jpa_2.0_spec</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-validation_1.0_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -438,7 +442,7 @@
             <dependency>
                 <groupId>net.sourceforge.serp</groupId>
                 <artifactId>serp</artifactId>
-                <version>1.11.0</version>
+                <version>1.13.1</version>
             </dependency>
 
             <dependency>



Mime
View raw message