Return-Path: 
 <scm-return-22385-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 3958 invoked from network); 29 Sep 2007 00:50:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Sep 2007 00:50:42 -0000
Received: (qmail 7249 invoked by uid 500); 29 Sep 2007 00:50:32 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 7219 invoked by uid 500); 29 Sep 2007 00:50:32 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 7208 invoked by uid 99); 29 Sep 2007 00:50:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2007 17:50:32 -0700
X-ASF-Spam-Status: No, hits=-98.8 required=10.0
	tests=ALL_TRUSTED,DNS_FROM_DOB,RCVD_IN_DOB
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Sep 2007 00:50:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A33951A9832; Fri, 28 Sep 2007 17:50:21 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r580523 - in /geronimo/server/branches/2.0:
 assemblies/geronimo-jetty6-jee5/
 assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/
 assemblies/geronimo-tomcat6-jee5/
 assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/ co...
Date: Sat, 29 Sep 2007 00:50:21 -0000
To: scm@geronimo.apache.org
From: akulshreshtha@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070929005021.A33951A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: akulshreshtha
Date: Fri Sep 28 17:50:19 2007
New Revision: 580523

URL: http://svn.apache.org/viewvc?rev=580523&view=rev
Log:
GERONIMO-3456 - Wire MEJB into assembly

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/branches/2.0/configs/pom.xml

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/pom.xml?rev=580523&r1=580522&r2=580523&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/pom.xml Fri Sep 28 17:50:19 2007
@@ -225,6 +225,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>mejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>myfaces</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?rev=580523&r1=580522&r2=580523&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Fri Sep 28 17:50:19 2007
@@ -311,6 +311,8 @@
     <module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/ca-helper-jetty/${version}/car" load="false"/>
+
+    <module name="org.apache.geronimo.configs/mejb/${version}/car"/>
     
     <module name="org.apache.geronimo.configs/clustering/${version}/car">
         <gbean name="Node">

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/pom.xml?rev=580523&r1=580522&r2=580523&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/pom.xml Fri Sep 28 17:50:19 2007
@@ -263,6 +263,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>mejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?rev=580523&r1=580522&r2=580523&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml Fri Sep 28 17:50:19 2007
@@ -320,6 +320,8 @@
 
     <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
 
+    <module name="org.apache.geronimo.configs/mejb/${version}/car"/>
+
     <module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/ca-helper-tomcat/${version}/car" load="false"/>

Modified: geronimo/server/branches/2.0/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/pom.xml?rev=580523&r1=580522&r2=580523&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/pom.xml Fri Sep 28 17:50:19 2007
@@ -143,6 +143,7 @@
         <!--<module>ldap-demo-jetty</module>-->
         <!--<module>ldap-demo-tomcat</module>-->
         <!--<module>ldap-realm</module>-->
+        <module>mejb</module>
         <module>offline-deployer</module>
         <module>online-deployer</module>
         <module>openejb</module>