Return-Path: 
 <scm-return-10160-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 60693 invoked from network); 25 Jan 2006 20:45:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 Jan 2006 20:45:47 -0000
Received: (qmail 38150 invoked by uid 500); 25 Jan 2006 20:45:46 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 38117 invoked by uid 500); 25 Jan 2006 20:45:46 -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 38105 invoked by uid 99); 25 Jan 2006 20:45:46 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2006 12:45:46 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 25 Jan 2006 12:45:45 -0800
Received: (qmail 60451 invoked by uid 65534); 25 Jan 2006 20:45:25 -0000
Message-ID: <20060125204525.60399.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r372310 - in /geronimo/branches:
 1.0/configs/j2ee-server/src/plan/plan.xml lw_assemblies/
Date: Wed, 25 Jan 2006 20:45:23 -0000
To: scm@geronimo.apache.org
From: bsnyder@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: bsnyder
Date: Wed Jan 25 12:45:20 2006
New Revision: 372310

URL: http://svn.apache.org/viewcvs?rev=372310&view=rev
Log:
Removed the lw_assemblies branch as David Jencks merged it to the trunk yesterday.

Removed:
    geronimo/branches/lw_assemblies/
Modified:
    geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml

Modified: geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml?rev=372310&r1=372309&r2=372310&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml Wed Jan 25 12:45:20 2006
@@ -88,6 +88,8 @@
         <reference name="Executor"><name>DefaultThreadPool</name></reference>
         <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
     </gbean>
+
+    <!--
     <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
         <reference name="ContainerIndex">
             <gbean-name>openejb:type=ContainerIndex</gbean-name>
@@ -97,8 +99,10 @@
             <name>Server</name>
         </reference>
     </gbean>
+    -->
 
     <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
+    <!--
     <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
         <references name="EJBContainers">
             <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
@@ -106,6 +110,7 @@
             <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
         </references>
     </gbean>
+    -->
 
     <!-- JSR77 Management Objects -->
     <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
@@ -117,7 +122,9 @@
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
 
+    <!--
     <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+    -->
 
     <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>