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 2009/10/07 05:00:55 UTC

svn commit: r822566 - in /geronimo/server/trunk: plugingroups/persistence/pom.xml plugingroups/persistence/src/main/history/dependencies.xml plugins/openjpa2/pom.xml plugins/pom.xml pom.xml

Author: dwoods
Date: Wed Oct  7 03:00:55 2009
New Revision: 822566

URL: http://svn.apache.org/viewvc?rev=822566&view=rev
Log:
switch over to jpa2 plugins

Modified:
    geronimo/server/trunk/plugingroups/persistence/pom.xml
    geronimo/server/trunk/plugingroups/persistence/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugingroups/persistence/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/pom.xml?rev=822566&r1=822565&r2=822566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/persistence/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/pom.xml Wed Oct  7 03:00:55 2009
@@ -40,14 +40,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugingroups/persistence/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/src/main/history/dependencies.xml?rev=822566&r1=822565&r2=822566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/persistence/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/src/main/history/dependencies.xml Wed Oct  7 03:00:55 2009
@@ -8,12 +8,12 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>persistence-jpa10-deployer</artifactId>
+        <artifactId>persistence-jpa20-deployer</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=822566&r1=822565&r2=822566&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Wed Oct  7 03:00:55 2009
@@ -104,6 +104,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>
 

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=822566&r1=822565&r2=822566&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Oct  7 03:00:55 2009
@@ -79,8 +79,8 @@
         <module>jaxws</module>
         <module>myfaces</module>
         <module>openejb</module>
-        <module>openjpa</module>
-<!--        <module>openjpa2</module>-->
+        <!-- <module>openjpa</module> -->
+        <module>openjpa2</module>
 <!--        <module>openwebbeans</module>-->
         <module>plancreator</module>
         <module>webservices</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=822566&r1=822565&r2=822566&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Oct  7 03:00:55 2009
@@ -107,7 +107,7 @@
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
         <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${version}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
+        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</jpaDeployer>
 
         <!-- Common plan properties -->
         <PlanServerHostname>0.0.0.0</PlanServerHostname>