Return-Path: 
 <scm-return-8067-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 16624 invoked from network); 5 Oct 2005 03:18:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Oct 2005 03:18:57 -0000
Received: (qmail 11493 invoked by uid 500); 5 Oct 2005 03:18:57 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 11482 invoked by uid 500); 5 Oct 2005 03:18:56 -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 11471 invoked by uid 99); 5 Oct 2005 03:18:56 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Oct 2005 20:18:56 -0700
X-ASF-Spam-Status: No, hits=-9.8 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; Tue, 04 Oct 2005 20:19:01 -0700
Received: (qmail 16508 invoked by uid 65534); 5 Oct 2005 03:18:35 -0000
Message-ID: <20051005031835.16504.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r294976 - in
 /geronimo/trunk/modules/assembly/src/var/config:
 config.jetty.xml config.tomcat.xml
Date: Wed, 05 Oct 2005 03:18:34 -0000
To: scm@geronimo.apache.org
From: djencks@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: djencks
Date: Tue Oct  4 20:18:31 2005
New Revision: 294976

URL: http://svn.apache.org/viewcvs?rev=294976&view=rev
Log:
Use complete web container names: previously tomcat ejb ws did not work.  Thanks to Stefan Schmidt for finding this

Modified:
    geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
    geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml

Modified: geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml?rev=294976&r1=294975&r2=294976&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml Tue Oct  4 20:18:31 2005
@@ -15,7 +15,7 @@
             <attribute name="defaultNamespace">${PlanJettyWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/RuntimeDeployer">
@@ -23,7 +23,7 @@
             <attribute name="defaultNamespace">${PlanJettyWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/Jetty">

Modified: geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml?rev=294976&r1=294975&r2=294976&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml Tue Oct  4 20:18:31 2005
@@ -15,7 +15,7 @@
             <attribute name="defaultNamespace">${PlanTomcatWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/RuntimeDeployer">
@@ -23,7 +23,7 @@
             <attribute name="defaultNamespace">${PlanTomcatWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/Jetty">