You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/06/22 19:39:44 UTC
svn commit: r416428 - in /geronimo/branches/dain/openejb-2.2-merge:
configs/openejb-deployer/src/plan/plan.xml
configs/system-database/project.xml etc/explicit_versions.properties
maven.xml
Author: dain
Date: Thu Jun 22 10:39:43 2006
New Revision: 416428
URL: http://svn.apache.org/viewvc?rev=416428&view=rev
Log:
Updated plans to reflect new openejb code.
Modified:
geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/src/plan/plan.xml
geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml
geronimo/branches/dain/openejb-2.2-merge/etc/explicit_versions.properties
geronimo/branches/dain/openejb-2.2-merge/maven.xml
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/src/plan/plan.xml?rev=416428&r1=416427&r2=416428&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/src/plan/plan.xml Thu Jun 22 10:39:43 2006
@@ -20,11 +20,11 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="EJBBuilder" class="org.openejb.deployment.OpenEjbModuleBuilder">
<attribute name="listener">?name=WebContainer</attribute>
- <attribute name="defaultStatelessEjbContainer">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/openejb/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessEjbContainer,name=StatelessEjbContainer</attribute>
- <attribute name="defaultStatefulEjbContainer">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/openejb/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatefulEjbContainer,name=StatefulEjbContainer</attribute>
- <attribute name="defaultBmpEjbContainer">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/openejb/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=BmpEjbContainer,name=BmpEjbContainer</attribute>
- <attribute name="defaultCmpEjbContainer">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/openejb/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CmpEjbContainer,name=CmpEjbContainer</attribute>
- <attribute name="defaultMdbEjbContainer">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/openejb/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=MdbEjbContainer,name=MdbEjbContainer</attribute>
+ <attribute name="defaultStatelessEjbContainer">StatelessEjbContainer</attribute>
+ <attribute name="defaultStatefulEjbContainer">StatefulEjbContainer</attribute>
+ <attribute name="defaultBmpEjbContainer">BmpEjbContainer</attribute>
+ <attribute name="defaultCmpEjbContainer">CmpEjbContainer</attribute>
+ <attribute name="defaultMdbEjbContainer">MdbEjbContainer</attribute>
<reference name="WebServiceLinkTemplate">
<name>WebServiceEJBLinkTemplate</name>
</reference>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml?rev=416428&r1=416427&r2=416428&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml Thu Jun 22 10:39:43 2006
@@ -59,24 +59,6 @@
<packaging.config.order>3</packaging.config.order>
</properties>
</dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${geronimo_version}</version>
- <type>car</type>
- <properties>
- <packaging.config.order>4</packaging.config.order>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>axis-deployer</artifactId>
- <version>${geronimo_version}</version>
- <type>car</type>
- <properties>
- <packaging.config.order>5</packaging.config.order>
- </properties>
- </dependency>
<!-- parent config -->
<dependency>
Modified: geronimo/branches/dain/openejb-2.2-merge/etc/explicit_versions.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/etc/explicit_versions.properties?rev=416428&r1=416427&r2=416428&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/etc/explicit_versions.properties (original)
+++ geronimo/branches/dain/openejb-2.2-merge/etc/explicit_versions.properties Thu Jun 22 10:39:43 2006
@@ -8,7 +8,7 @@
activeio///=2.0-r118
activemq///=3.2.4-SNAPSHOT
geronimo///=1.2-SNAPSHOT
-openejb///=2.1
+openejb///=2.2-SNAPSHOT
tranql/tranql//jar=1.4-SNAPSHOT
tranql/connector//rar=1.3-SNAPSHOT
tranql///=1.1
Modified: geronimo/branches/dain/openejb-2.2-merge/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/maven.xml?rev=416428&r1=416427&r2=416428&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/maven.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/maven.xml Thu Jun 22 10:39:43 2006
@@ -281,7 +281,7 @@
<!--gscm:checkout module="howl/logger" root="${geronimo.howl.cvs.access}@cvs.forge.objectweb.org:/cvsroot/howl"/-->
<!-- http isn't working to svn.codehaus.org. so using https for now... -->
<ant:exec dir="${basedir}" executable="svn">
- <ant:arg line="checkout https://svn.codehaus.org/openejb/branches/v2_1/openejb2 openejb"/>
+ <ant:arg line="checkout https://svn.codehaus.org/openejb/branches/dain-2.2-merge/merged"/>
</ant:exec>
<!-- <gscm:checkout-tag module="openejb" root="${geronimo.openejb.cvs.access}@cvs.openejb.org:/home/projects/openejb/scm" tag="v2_0"/> -->
<!--