geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r906935 - in /geronimo/plugins/openjpa2/branches/2.2: ./ geronimo-openjpa2/ geronimo-persistence-jpa20-builder/ geronimo-persistence-jpa20/ geronimo-persistence-jpa20/src/main/appended-resources/META-INF/ geronimo-persistence-jpa20/src/main...
Date Fri, 05 Feb 2010 13:57:30 GMT
Author: dwoods
Date: Fri Feb  5 13:57:29 2010
New Revision: 906935

URL: http://svn.apache.org/viewvc?rev=906935&view=rev
Log:
GERONIMO-4946 upgrade to OpenJPA 2.0.0-beta level code

Modified:
    geronimo/plugins/openjpa2/branches/2.2/NOTICE
    geronimo/plugins/openjpa2/branches/2.2/README.txt
    geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/appended-resources/META-INF/NOTICE.vm
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/appended-resources/META-INF/NOTICE.vm
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.2/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.2/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/NOTICE?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/NOTICE (original)
+++ geronimo/plugins/openjpa2/branches/2.2/NOTICE Fri Feb  5 13:57:29 2010
@@ -1,9 +1,6 @@
 Apache Geronimo
-Copyright 2003-2009 The Apache Software Foundation
+Copyright 2003-2010 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-
-This is an implementation of an early-draft specification developed under the Java Community
Process (JCP). The code is untested and presumed not to be a compatible implementation of
the JSR-317 Java Persistence API, Version 2.0 specification.  We encourage you to migrate
to an implementation of the JSR-317 Java Persistence API, Version 2.0 specification that has
been tested and verified to be compatible as soon as such an implementation is available,
and we encourage you to retain this notice in any implementation of JSR-317 Java Persistence
API, Version 2.0 specification that you distribute.
-

Modified: geronimo/plugins/openjpa2/branches/2.2/README.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/README.txt?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/README.txt (original)
+++ geronimo/plugins/openjpa2/branches/2.2/README.txt Fri Feb  5 13:57:29 2010
@@ -1,24 +1,21 @@
-Apache OpenJPA 2.0 Plugin for Apache Geronimo 2.2 Server
-Copyright 2003-2009 The Apache Software Foundation
+Apache OpenJPA 2.0.0-beta Plugin for Apache Geronimo 2.2 Server
+Copyright 2003-2010 The Apache Software Foundation
 --------------------------------------------------------------------------------
 
 Notice -
 --------
-The geronimo-persistence-jpa20 module implements EJB wrappers for some of the
-JPA2 API and requires this notice -
-
-This is an implementation of an early-draft specification developed under the Java Community
Process (JCP). The code is untested and presumed not to be a compatible implementation of
the JSR-317 Java Persistence API, Version 2.0 specification.  We encourage you to migrate
to an implementation of the JSR-317 Java Persistence API, Version 2.0 specification that has
been tested and verified to be compatible as soon as such an implementation is available,
and we encourage you to retain this notice in any implementation of JSR-317 Java Persistence
API, Version 2.0 specification that you distribute.
-
-Please refer to the NOTICE and LICENSE files included in the OpenJPA JAR for 
-additional notices and licenses.
+When installing this plugin, additional artifacts that this plugin requires
+may also be installed.  Please refer to the NOTICE and LICENSE files included
+in those artifacts (like the Apache OpenJPA JAR) for additional notices
+and licenses.
 
 
 Building -
 ----------
-The build requires access to the latest Geronimo 2.2-SNAPSHOT server artifacts.
+The build requires access to the latest Geronimo 2.2 server artifacts.
 The most dependable way to build, is to build the server locally first, by
 checking out from svn at -
-    https://svn.apache.org/repos/asf/geronimo/server/branches/2.2/
+    https://svn.apache.org/repos/asf/geronimo/server/tags/2.2/
 You will need the same build tools as the 2.2 Server, such as:
     Maven 2.0.10 or later
     Java SE 6 - Note: Some features in OpenJPA 2.0 require Java SE 6
@@ -29,7 +26,7 @@
 Installing -
 ------------
 The OpenJPA2 plugins can be installed on these levels of the Geronimo Server -
-    2.2-SNAPSHOT
+    2.2 and 2.2.1-SNAPSHOT
 
 Note:  Installing the OpenJPA2 plugins will replace the existing OpenJPA plugin.
 

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml Fri Feb  5 13:57:29 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml Fri
Feb  5 13:57:29 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml Fri Feb  5 13:57:29
2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/appended-resources/META-INF/NOTICE.vm?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/appended-resources/META-INF/NOTICE.vm
Fri Feb  5 13:57:29 2010
@@ -1,23 +0,0 @@
-##
-## 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.
-##
-## $Rev: 651007 $ $Date: 2008-04-23 14:59:19 -0400 (Wed, 23 Apr 2008) $
-##
-
-This is an implementation of an early-draft specification developed under the Java Community
Process (JCP). The code is untested and presumed not to be a compatible implementation of
the JSR-317 Java Persistence API, Version 2.0 specification.  We encourage you to migrate
to an implementation of the JSR-317 Java Persistence API, Version 2.0 specification that has
been tested and verified to be compatible as soon as such an implementation is available,
and we encourage you to retain this notice in any implementation of JSR-317 Java Persistence
API, Version 2.0 specification that you distribute.
-

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerExtended.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/NoTxQueryWrapper.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManager.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/mockjpa/MockEntityManagerFactory.java
Fri Feb  5 13:57:29 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/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml Fri Feb  5 13:57:29 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
     
     <artifactId>jpa-ear</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml Fri Feb  5 13:57:29 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml Fri Feb  5 13:57:29 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-war</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml Fri Feb  5 13:57:29 2010
@@ -28,25 +28,24 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2</version>
     </parent>
     -->
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
     <artifactId>jpa-tests</artifactId>
-    <version>2.2-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
 
     <properties>
-        <openjpaVersion>2.0.0-M3</openjpaVersion>
-        <jpa2specVersion>1.0-PFD2</jpa2specVersion>
+        <openjpaVersion>2.0.0-beta</openjpaVersion>
+        <jpa2specVersion>1.0</jpa2specVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml Fri Feb  5 13:57:29 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -112,6 +112,9 @@
                             <!-- config.xml and offline-deployer-config.xml -->
                             <config-xml-content server="default" />
                             <config-xml-content server="offline" />
+                            <!-- handle upgrading prior openjpa2 2.2-M3 CAR -->
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <!-- handle openjpa to openjpa2 CAR alias -->
                             <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/appended-resources/META-INF/NOTICE.vm?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/appended-resources/META-INF/NOTICE.vm
Fri Feb  5 13:57:29 2010
@@ -1,23 +0,0 @@
-##
-## 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.
-##
-## $Rev: 651007 $ $Date: 2008-04-23 14:59:19 -0400 (Wed, 23 Apr 2008) $
-##
-
-This is an implementation of an early-draft specification developed under the Java Community
Process (JCP). The code is untested and presumed not to be a compatible implementation of
the JSR-317 Java Persistence API, Version 2.0 specification.  We encourage you to migrate
to an implementation of the JSR-317 Java Persistence API, Version 2.0 specification that has
been tested and verified to be compatible as soon as such an implementation is available,
and we encourage you to retain this notice in any implementation of JSR-317 Java Persistence
API, Version 2.0 specification that you distribute.
-

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml Fri
Feb  5 13:57:29 2010
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml Fri Feb  5 13:57:29
2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -136,6 +136,9 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
+                            <!-- handle upgrading persistence-jpa20-deployer -->
+                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
                             <!-- handle persistence-jpa10-deployer to jpa20 -->
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>

Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
Fri Feb  5 13:57:29 2010
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>persistence-jpa20-deployer</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.2-beta-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/pom.xml?rev=906935&r1=906934&r2=906935&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/pom.xml Fri Feb  5 13:57:29 2010
@@ -37,7 +37,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>openjpa2</artifactId>
-    <version>2.2-M3-SNAPSHOT</version>
+    <version>2.2-beta-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Geronimo Plugins, OpenJPA2</name>
@@ -50,9 +50,9 @@
     </scm>
 
     <properties>
-        <openjpa2Version>2.0.0-M3</openjpa2Version>
-        <jpa2specVersion>1.0-PFD2</jpa2specVersion>
-        <bvspecVersion>1.0-CR5</bvspecVersion>
+        <openjpa2Version>2.0.0-beta</openjpa2Version>
+        <jpa2specVersion>1.0</jpa2specVersion>
+        <bvspecVersion>1.0</bvspecVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- set siteId to artifactId for any "top level" project rooting a website -->



Mime
View raw message