geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r822759 - in /geronimo/server/trunk: plugins/clustering/clustering-it/customer-jetty/ plugins/clustering/geronimo-plugin-farm/ plugins/clustering/plugin-farm/src/main/history/ plugins/connector-1_6/client-transaction-1_6/ plugins/connector-...
Date Wed, 07 Oct 2009 14:36:57 GMT
Author: dwoods
Date: Wed Oct  7 14:36:56 2009
New Revision: 822759

URL: http://svn.apache.org/viewvc?rev=822759&view=rev
Log:
missed updating some jpa10 config and deployer depends

Modified:
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml Wed Oct
 7 14:36:56 2009
@@ -87,7 +87,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml Wed Oct  7 14:36:56
2009
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
Wed Oct  7 14:36:56 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml Wed Oct  7
14:36:56 2009
@@ -82,7 +82,7 @@
 
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-persistence-jpa10</artifactId>-->
+            <!--<artifactId>geronimo-persistence-jpa20</artifactId>-->
             <!--<version>${version}</version>-->
         <!--</dependency>-->
 

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml Wed Oct  7 14:36:56
2009
@@ -89,7 +89,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-persistence-jpa10</artifactId>
+            <artifactId>geronimo-persistence-jpa20</artifactId>
             <version>${version}</version>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
Wed Oct  7 14:36:56 2009
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-persistence-jpa10</artifactId>
+        <artifactId>geronimo-persistence-jpa20</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Wed Oct  7 14:36:56 2009
@@ -62,7 +62,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -107,7 +107,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
Wed Oct  7 14:36:56 2009
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml Wed Oct  7 14:36:56 2009
@@ -62,7 +62,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -114,7 +114,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
Wed Oct  7 14:36:56 2009
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Wed Oct  7 14:36:56 2009
@@ -36,8 +36,8 @@
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-<!--
             <exclusions>
+<!--
                 <exclusion>
                     <groupId>org.apache.geronimo.framework</groupId>
                     <artifactId>geronimo-security</artifactId>
@@ -74,12 +74,12 @@
                     <groupId>stax</groupId>
                     <artifactId>stax-api</artifactId>
                 </exclusion>
+-->
                 <exclusion>
                     <groupId>org.apache.openjpa</groupId>
                     <artifactId>openjpa-persistence-jdbc</artifactId>
                 </exclusion>
             </exclusions>
--->
         </dependency>
 
         <dependency>
@@ -150,7 +150,7 @@
         
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-persistence-jpa10</artifactId>-->
+            <!--<artifactId>geronimo-persistence-jpa20</artifactId>-->
             <!--<version>${version}</version>-->
         <!--</dependency>-->
     </dependencies>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Wed Oct  7 14:36:56 2009
@@ -90,7 +90,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <type>car</type>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Wed Oct
 7 14:36:56 2009
@@ -13,7 +13,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
Wed Oct  7 14:36:56 2009
@@ -21,9 +21,4 @@
         <artifactId>geronimo-persistence-jpa20-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-persistence-jpa20</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=822759&r1=822758&r2=822759&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
(original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
Wed Oct  7 14:36:56 2009
@@ -32,7 +32,7 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>openjpa</artifactId>
+                <artifactId>openjpa2</artifactId>
                 <type>car</type>
             </dependency>
 



Mime
View raw message