Return-Path: 
 <scm-return-39527-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 14316 invoked from network); 14 Dec 2009 21:53:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 14 Dec 2009 21:53:52 -0000
Received: (qmail 27305 invoked by uid 500); 14 Dec 2009 21:53:51 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 26985 invoked by uid 500); 14 Dec 2009 21:53:51 -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 26680 invoked by uid 99); 14 Dec 2009 21:53:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2009 21:53:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2009 21:53:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8687323889C5; Mon, 14 Dec 2009 21:53:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r890495 - in /geronimo/server/trunk/plugins:
 tomcat/tomcat7-clustering-builder-wadi/src/main/plan/plan.xml
 tomcat/tomcat7-deployer/src/main/plan/plan.xml
 welcome/welcome-tomcat/src/main/history/dependencies.xml
Date: Mon, 14 Dec 2009 21:53:27 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091214215327.8687323889C5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Mon Dec 14 21:53:26 2009
New Revision: 890495

URL: http://svn.apache.org/viewvc?rev=890495&view=rev
Log:
extirpate more tomcat6 references

Modified:
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/welcome/welcome-tomcat/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/plan/plan.xml?rev=890495&r1=890494&r2=890495&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/plan/plan.xml Mon Dec 14 21:53:26 2009
@@ -26,13 +26,13 @@
         <attribute name="defaultNumPartitions">24</attribute>
         <attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>
         <attribute name="defaultClusterName">?name=DefaultCluster</attribute>
-        <attribute name="artifactToRemoveFromEnvironment">org.apache.geronimo.configs/tomcat6//car</attribute>
+        <attribute name="artifactToRemoveFromEnvironment">org.apache.geronimo.configs/tomcat7//car</attribute>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
-                        <artifactId>tomcat6-clustering-wadi</artifactId>
+                        <artifactId>tomcat7-clustering-wadi</artifactId>
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml?rev=890495&r1=890494&r2=890495&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml Mon Dec 14 21:53:26 2009
@@ -75,7 +75,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
-                        <artifactId>tomcat6</artifactId>
+                        <artifactId>tomcat7</artifactId>
                         <version>${version}</version>
                         <type>car</type>
                     </dependency>
@@ -98,6 +98,6 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="Tomcat6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+    <gbean name="Tomcat7WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
 
 </module>

Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat/src/main/history/dependencies.xml?rev=890495&r1=890494&r2=890495&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat/src/main/history/dependencies.xml Mon Dec 14 21:53:26 2009
@@ -13,7 +13,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6</artifactId>
+        <artifactId>tomcat7</artifactId>
         <type>car</type>
     </dependency>
     <dependency>