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 2010/04/01 17:38:51 UTC
svn commit: r930010 - in /geronimo/server/trunk: plugingroups/ejb/pom.xml
plugingroups/ejb/src/main/history/dependencies.xml
plugingroups/javaee6-jetty/pom.xml
plugingroups/javaee6-jetty/src/main/history/dependencies.xml plugins/pom.xml
Author: djencks
Date: Thu Apr 1 15:38:51 2010
New Revision: 930010
URL: http://svn.apache.org/viewvc?rev=930010&view=rev
Log:
GERONIMO=5210 enable openejb in build, it is pretty much working
Modified:
geronimo/server/trunk/plugingroups/ejb/pom.xml
geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/pom.xml
Modified: geronimo/server/trunk/plugingroups/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/pom.xml?rev=930010&r1=930009&r2=930010&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/pom.xml Thu Apr 1 15:38:51 2010
@@ -38,26 +38,41 @@
</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-corba-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>openejb-corba-deployer</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>j2ee-corba-yoko</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>mejb</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
+
+ <!-- these will be implied by the above, once the above work again -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-corba-yoko</artifactId>
+ <artifactId>openejb</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>mejb</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml?rev=930010&r1=930009&r2=930010&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/src/main/history/dependencies.xml Thu Apr 1 15:38:51 2010
@@ -8,17 +8,12 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-corba-yoko</artifactId>
+ <artifactId>openejb</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>mejb</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-corba-deployer</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml?rev=930010&r1=930009&r2=930010&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml Thu Apr 1 15:38:51 2010
@@ -72,12 +72,12 @@
<!--<type>car</type>-->
<!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.plugingroups</groupId>-->
- <!--<artifactId>ejb</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>ejb</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml?rev=930010&r1=930009&r2=930010&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml Thu Apr 1 15:38:51 2010
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>ejb</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>jms</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=930010&r1=930009&r2=930010&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Apr 1 15:38:51 2010
@@ -150,7 +150,7 @@
<!--<module>concurrent</module>-->
<!--<module>procrun</module>-->
<module>jetty8</module>
- <module>tomcat</module>
+ <!--<module>tomcat</module>-->
<module>aries</module>
<module>wab</module>
</modules>