You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/02/04 18:54:04 UTC

svn commit: r906582 - in /geronimo/plugins/openjpa2/branches/2.1: ./ geronimo-openjpa2/ geronimo-persistence-jpa20-builder/ geronimo-persistence-jpa20/ geronimo-persistence-jpa20/src/main/appended-resources/META-INF/ jpa-tests/ jpa-tests/jpa-ear/ jpa-t...

Author: dwoods
Date: Thu Feb  4 17:54:02 2010
New Revision: 906582

URL: http://svn.apache.org/viewvc?rev=906582&view=rev
Log:
GERONIMO-4946 Part 1 of upgrading to openjpa-2.0.0-beta

Removed:
    geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/src/main/appended-resources/META-INF/NOTICE.vm
    geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/appended-resources/META-INF/NOTICE.vm
Modified:
    geronimo/plugins/openjpa2/branches/2.1/NOTICE
    geronimo/plugins/openjpa2/branches/2.1/README.txt
    geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.1/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.1/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/NOTICE?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/NOTICE (original)
+++ geronimo/plugins/openjpa2/branches/2.1/NOTICE Thu Feb  4 17:54:02 2010
@@ -1,9 +1,6 @@
-Apache Geronimo
-Copyright 2003-2009 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.
-
+Apache Geronimo
+Copyright 2003-2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Modified: geronimo/plugins/openjpa2/branches/2.1/README.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/README.txt?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/README.txt (original)
+++ geronimo/plugins/openjpa2/branches/2.1/README.txt Thu Feb  4 17:54:02 2010
@@ -1,16 +1,13 @@
-Apache OpenJPA 2.0 Plugin for Apache Geronimo 2.1 Server
-Copyright 2003-2009 The Apache Software Foundation
+Apache OpenJPA 2.0.0-beta Plugin for Apache Geronimo 2.1 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 downloaded.  Please refer to the NOTICE and LICENSE files included
+in the those artifacts (like the Apache OpenJPA JAR) for additional notices
+and licenses.
 
 
 Building -

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml Thu Feb  4 17:54:02 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml Thu Feb  4 17:54:02 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml Thu Feb  4 17:54:02 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml Thu Feb  4 17:54:02 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
     
     <artifactId>jpa-ear</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml Thu Feb  4 17:54:02 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml Thu Feb  4 17:54:02 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-war</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml Thu Feb  4 17:54:02 2010
@@ -34,7 +34,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
@@ -44,7 +44,7 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
 
     <properties>
-        <openjpaVersion>2.0.0-M3</openjpaVersion>
+        <openjpaVersion>2.0.0-beta</openjpaVersion>
         <jpa2specVersion>1.0-PFD2</jpa2specVersion>
     </properties>
 

Modified: geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml Thu Feb  4 17:54:02 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml Thu Feb  4 17:54:02 2010
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml Thu Feb  4 17:54:02 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml Thu Feb  4 17:54:02 2010
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>persistence-jpa20-deployer</artifactId>
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=906582&r1=906581&r2=906582&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Thu Feb  4 17:54:02 2010
@@ -37,7 +37,7 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>openjpa2</artifactId>
-    <version>2.1.3-M3-SNAPSHOT</version>
+    <version>2.1.3-beta-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Geronimo Plugins, OpenJPA2</name>
@@ -66,9 +66,9 @@
 
     <properties>
         <!-- plugin version, which has to match pom version above -->
-        <version>2.1.3-M3-SNAPSHOT</version>
+        <version>2.1.3-beta-SNAPSHOT</version>
 
-        <openjpa2Version>2.0.0-M3</openjpa2Version>
+        <openjpa2Version>2.0.0-beta</openjpa2Version>
         <jpa2specVersion>1.0-PFD2</jpa2specVersion>
         <bvspecVersion>1.0-CR5</bvspecVersion>
         <geronimoVersion>2.1.3</geronimoVersion>