You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/03/16 00:15:22 UTC
svn commit: r518804 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
configs/persistence-jpa10-deployer/src/plan/plan.xml
Author: djencks
Date: Thu Mar 15 16:15:22 2007
New Revision: 518804
URL: http://svn.apache.org/viewvc?view=rev&rev=518804
Log:
GERONIMO-2937 compensate for taking openjpa classes out of openejb direct dependencies
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties?view=diff&rev=518804&r1=518803&r2=518804
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties Thu Mar 15 16:15:22 2007
@@ -22,3 +22,4 @@
#the next 2 lines allow running the webservices-common config on the client
org.apache.geronimo.configs/j2ee-security//car=org.apache.geronimo.configs/client-security/${version}/car
org.apache.geronimo.configs/j2ee-server//car=org.apache.geronimo.configs/client/${version}/car
+org.apache.geronimo.configs/transaction-jta11//car=org.apache.geronimo.configs/client-transaction/${version}/car
Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml?view=diff&rev=518804&r1=518803&r2=518804
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml Thu Mar 15 16:15:22 2007
@@ -26,20 +26,21 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction-jta11</artifactId>
+ <artifactId>openjpa</artifactId>
<type>car</type>
</dependency>
</dependencies>
</environment>
</xml-attribute>
</gbean>
+ <!-- TODO possibly the ref builders only need a dependency on transaction-jta11 -->
<gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceContextRefBuilder">
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction-jta11</artifactId>
+ <artifactId>openjpa</artifactId>
<type>car</type>
</dependency>
</dependencies>
@@ -52,7 +53,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction-jta11</artifactId>
+ <artifactId>openjpa</artifactId>
<type>car</type>
</dependency>
</dependencies>
@@ -66,7 +67,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-transaction</artifactId>
+ <artifactId>openjpa</artifactId>
<type>car</type>
</dependency>
</dependencies>
@@ -79,7 +80,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-transaction</artifactId>
+ <artifactId>openjpa</artifactId>
<type>car</type>
</dependency>
</dependencies>