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 2009/12/14 22:53:27 UTC
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
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>