geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r473004 - in /geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee: pom.xml src/main/assembly/bin.xml src/main/var/config/config.xml
Date Thu, 09 Nov 2006 18:25:12 GMT
Author: djencks
Date: Thu Nov  9 10:25:11 2006
New Revision: 473004

URL: http://svn.apache.org/viewvc?view=rev&rev=473004
Log:
GERONIMO-2460 add jpa support to tomcat j2ee server

Modified:
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml?view=diff&rev=473004&r1=473003&r2=473004
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml Thu Nov  9 10:25:11 2006
@@ -41,6 +41,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transformer-agent</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -195,14 +202,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -216,6 +223,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -259,6 +273,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?view=diff&rev=473004&r1=473003&r2=473004
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml Thu Nov
 9 10:25:11 2006
@@ -46,6 +46,14 @@
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>jpa.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:transformer-agent</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
             <includes>
                 <include>org.apache.geronimo.configs:j2ee-system</include>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=473004&r1=473003&r2=473004
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Thu
Nov  9 10:25:11 2006
@@ -117,10 +117,20 @@
 
     <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
 
+     <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"
condition="java.is1_5"/>
+
     <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=TomcatWebContainer</attribute>
-        </gbean>
+            <reference name="ServiceBuilders">
+                <pattern>
+                    <name>GBeanBuilder</name>
+                </pattern>
+                <pattern>
+                    <name>PersistenceUnitBuilder</name>
+                </pattern>
+            </reference>
+       </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car" load="false"/>



Mime
View raw message