geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r833390 - in /geronimo/server/branches/2.2/plugins: ./ openjpa2/ openjpa2/geronimo-openjpa2/ openjpa2/geronimo-persistence-jpa20-builder/ openjpa2/geronimo-persistence-jpa20/ openjpa2/openjpa2/ openjpa2/openjpa2/src/main/history/ openjpa2/p...
Date Fri, 06 Nov 2009 13:33:32 GMT
Author: dwoods
Date: Fri Nov  6 13:33:31 2009
New Revision: 833390

URL: http://svn.apache.org/viewvc?rev=833390&view=rev
Log:
GERONIMO-4946 Add an optional OpenJPA2 plugin and deployer (not in the server assemblies)
which can be used to start test driving JPA2 by users

Added:
    geronimo/server/branches/2.2/plugins/openjpa2/
      - copied from r826050, geronimo/server/branches/3.0_old/plugins/openjpa2/
Modified:
    geronimo/server/branches/2.2/plugins/openjpa2/geronimo-openjpa2/pom.xml
    geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
    geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/pom.xml
    geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
    geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/openjpa2/pom.xml
    geronimo/server/branches/2.2/plugins/pom.xml

Modified: geronimo/server/branches/2.2/plugins/openjpa2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-openjpa2/pom.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/geronimo-openjpa2/pom.xml Fri Nov  6 13:33:31
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
(original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
Fri Nov  6 13:33:31 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Fri Nov
 6 13:33:31 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -36,7 +36,8 @@
         <!-- g-transaction, g-system come from this -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-1_6</artifactId>
+            <!--<artifactId>geronimo-connector-1_6</artifactId>-->
+            <artifactId>geronimo-connector</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
@@ -61,7 +62,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+            <!--<artifactId>geronimo-ejb_3.1_spec</artifactId>-->
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/pom.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/pom.xml Fri Nov  6 13:33:31 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -69,7 +69,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
+            <!--<artifactId>transaction-1_6</artifactId>-->
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -82,6 +83,17 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Persistence</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>openjpa</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
Fri Nov  6 13:33:31 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -23,7 +23,8 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction-1_6</artifactId>
+        <!--<artifactId>transaction-1_6</artifactId>-->
+        <artifactId>transaction</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/pom.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/pom.xml Fri Nov
 6 13:33:31 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -51,7 +51,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
+            <!--<artifactId>transaction-1_6</artifactId>-->
+            <artifactId>transaction</artifactId>
             <type>car</type>
             <version>${version}</version>
         </dependency>
@@ -73,7 +74,8 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>transaction-1_6</artifactId>
+                            <!--<artifactId>transaction-1_6</artifactId>-->
+                            <artifactId>transaction</artifactId>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -124,6 +126,11 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>persistence-jpa10-deployer</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
Fri Nov  6 13:33:31 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>persistence-jpa20-deployer</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -13,7 +13,8 @@
     </dependency>
     <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction-1_6</artifactId>
+        <!--<artifactId>transaction-1_6</artifactId>-->
+        <artifactId>transaction</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -21,4 +22,9 @@
         <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/branches/2.2/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa2/pom.xml?rev=833390&r1=826050&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openjpa2/pom.xml Fri Nov  6 13:33:31 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa2</artifactId>
@@ -36,9 +36,10 @@
         OpenJPA2 plugin
     </description>
 
-<!-- These are in the geronimo-parent PM for now
     <properties>
-        <openjpaVersion>2.0.0-M3</openjpaVersion>
+        <openjpa2Version>2.0.0-M3</openjpa2Version>
+        <jpa2specVersion>1.0-PFD2</jpa2specVersion>
+        <bvspecVersion>1.0-CR5</bvspecVersion>
     </properties>
 
     <dependencyManagement>
@@ -46,7 +47,7 @@
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
-                <version>${openjpaVersion}</version>
+                <version>${openjpa2Version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.openjpa</groupId>
@@ -114,23 +115,22 @@
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-persistence-jdbc</artifactId>
-                <version>${openjpaVersion}</version>
+                <version>${openjpa2Version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.0-PFD2</version>
+                <version>${jpa2specVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-validation_1.0_spec</artifactId>
-                <version>1.0-CR5</version>
+                <version>${bvspecVersion}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
--->
 
     <modules>
         <module>geronimo-openjpa2</module>

Modified: geronimo/server/branches/2.2/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/pom.xml?rev=833390&r1=833389&r2=833390&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/pom.xml Fri Nov  6 13:33:31 2009
@@ -80,6 +80,7 @@
         <module>myfaces</module>
         <module>openejb</module>
         <module>openjpa</module>
+        <module>openjpa2</module>
         <module>plancreator</module>
         <module>webservices</module>
         <module>spring</module>



Mime
View raw message