geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r452779 - in /geronimo/sandbox/javaee5: ./ assemblies-jee5/geronimo-jetty6-jee5/ configs-jee5/ configs-jee5/openjpa/ configs-jee5/openjpa/src/ configs-jee5/openjpa/src/main/resources/META-INF/ configs-jee5/openjpa/src/plan/ configs-jee5/tra...
Date Wed, 04 Oct 2006 07:21:36 GMT
Author: djencks
Date: Wed Oct  4 00:21:35 2006
New Revision: 452779

URL: http://svn.apache.org/viewvc?view=rev&rev=452779
Log:
Make it easier to include openjpa in a server and easier to use jpa

Added:
    geronimo/sandbox/javaee5/configs-jee5/openjpa/
      - copied from r451688, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/
    geronimo/sandbox/javaee5/configs-jee5/openjpa/LICENSE.txt
      - copied unchanged from r452692, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/LICENSE.txt
    geronimo/sandbox/javaee5/configs-jee5/openjpa/NOTICE.txt
      - copied unchanged from r452692, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/NOTICE.txt
    geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml
      - copied, changed from r452692, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/openjpa/src/
      - copied from r452692, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/src/
Modified:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/javaee5/configs-jee5/openjpa/src/plan/plan.xml
    geronimo/sandbox/javaee5/configs-jee5/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/src/plan/plan.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml
    geronimo/sandbox/javaee5/pom.xml

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml Wed Oct  4 00:21:35
2006
@@ -288,18 +288,27 @@
             <type>car</type>
         </dependency>
         
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-builder-wadi</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency> 
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-wadi</artifactId> 
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+
     </dependencies>
     
     <build>

Copied: geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml (from r452692, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml?view=diff&rev=452779&p1=geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml&r1=452692&p2=geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml Wed Oct  4 00:21:35 2006
@@ -17,7 +17,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,29 +29,43 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>dojo-jetty6</artifactId>
-    <name>Geronimo Configs :: Dojo app jetty</name>
+    <artifactId>openjpa</artifactId>
+    <name>Geronimo Configs :: OpenJPA with dependencies</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-all</artifactId>
+            <version>0.9.0-incubating-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
-            <artifactId>geronimo-dojo</artifactId>
+            <groupId>net.sourceforge.serp</groupId>
+            <artifactId>serp</artifactId>
+            <version>1.11.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${pom.version}</version>
-            <type>war</type>
+            <type>car</type>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -58,7 +73,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -66,21 +81,10 @@
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <module>
-                        <groupId>org.apache.geronimo.applications</groupId>
-                        <artifactId>geronimo-dojo</artifactId>
-                        <version>${pom.version}</version>
-                        <type>war</type>
-                    </module>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/sandbox/javaee5/configs-jee5/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/openjpa/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=452779&r1=452692&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/javaee5/configs-jee5/openjpa/src/main/resources/META-INF/geronimo-plugin.xml
Wed Oct  4 00:21:35 2006
@@ -18,28 +18,15 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>Geronimo Dojo App (jetty)</name>
+    <name>Geronimo OpenJPA plugin</name>
     <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
     <category>Geronimo</category>
     <description>
-        The Dojo AJAX library for Geronimo.  This binds to /dojo so that
-        applications needing to add dojo support can simply include a
-        reference to /dojo/dojo.js to enable Dojo support.
+        OpenJPA plugin for geronimo.  This provides OpenJPA together with its dependencies
as one dependency.
     </description>
-    <url>http://dojotoolkit.org/</url>
-    <author>Dojo Foundation</author>
-    <license osi-approved="true">BSD and Academic Free License v2.1</license>
+    <url>http://cwiki.apache.org/confluence/display/openjpa/Index</url>
+    <author>Apache Software Foundation</author>
+    <license osi-approved="true">ASL 2</license>
     <geronimo-version>${pom.currentVersion}</geronimo-version>
-    <prerequisite>
-        <id>geronimo/jetty//car</id>
-        <resource-type>Web Container</resource-type>
-        <description>
-            This version of the Welcome application works with the Geronimo/Jetty distribution.
-            It is not intended to run in the Geronimo/Jetty distribution.
-            There is a separate version of the Welcome application that works with Jetty.
-            Please install the version appropriate to your Geronimo distribution.
-        </description>
-    </prerequisite>
-    <dependency>geronimo/j2ee-server//car</dependency>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/sandbox/javaee5/configs-jee5/openjpa/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/openjpa/src/plan/plan.xml?view=diff&rev=452779&r1=452692&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/openjpa/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/openjpa/src/plan/plan.xml Wed Oct  4 00:21:35 2006
@@ -17,8 +17,5 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-
-    <context-root>/dojo</context-root>
-    
-</web-app>
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+</module>

Modified: geronimo/sandbox/javaee5/configs-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/pom.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/pom.xml Wed Oct  4 00:21:35 2006
@@ -120,6 +120,7 @@
         <module>jetty6-clustering-builder-wadi</module>
         <module>dojo-jetty6</module>
         <module>webconsole-jetty6</module>
+        <module>openjpa</module>
     </modules>
     
 </project>

Modified: geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml Wed Oct  4 00:21:35 2006
@@ -60,6 +60,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
             <version>${pom.version}</version>
@@ -68,6 +73,12 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction-jta11</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-persistence-jpa10</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/src/plan/plan.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/src/plan/plan.xml Wed Oct  4 00:21:35
2006
@@ -89,4 +89,19 @@
         </references>
     </gbean>
 
+    <gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionManager</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+    <gbean name="TransactionSynchronizationRegistryBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionSynchronizationRegistry</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+
 </module>

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml Wed Oct  4 00:21:35
2006
@@ -108,7 +108,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml Wed Oct  4 00:21:35
2006
@@ -122,7 +122,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/pom.xml?view=diff&rev=452779&r1=452778&r2=452779
==============================================================================
--- geronimo/sandbox/javaee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/pom.xml Wed Oct  4 00:21:35 2006
@@ -72,6 +72,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>



Mime
View raw message